Skip to content

Commit db9ceb3

Browse files
committed
Changed mentions of people with roles on the various group pages to link to both their profile page and their email address.
- Legacy-Id: 13665
1 parent e6c8b66 commit db9ceb3

2 files changed

Lines changed: 0 additions & 29 deletions

File tree

ietf/meeting/urls.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
url(r'^timeslots/edit$', views.edit_timeslots),
4444
url(r'^rooms$', ajax.timeslot_roomsurl),
4545
url(r'^room/(?P<roomid>\d+).json$', ajax.timeslot_roomurl),
46-
url(r'^room/(?P<roomid>\d+)(?:.html)?/?$', views.edit_roomurl),
4746
url(r'^timeslots$', ajax.timeslot_slotsurl),
4847
url(r'^timeslots.json$', ajax.timeslot_slotsurl),
4948
url(r'^timeslot/(?P<slotid>\d+).json$', ajax.timeslot_sloturl),

ietf/meeting/views.py

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -268,34 +268,6 @@ class Meta:
268268
model = Room
269269
exclude = ('meeting',)
270270

271-
@role_required('Secretariat')
272-
def edit_roomurl(request, num, roomid):
273-
log.unreachable("07 Mar 2017")
274-
meeting = get_meeting(num)
275-
276-
try:
277-
room = meeting.room_set.get(pk=roomid)
278-
except Room.DoesNotExist:
279-
raise Http404("No room %u for meeting %s" % (roomid, meeting.name))
280-
281-
if request.POST:
282-
roomform = RoomForm(request.POST, instance=room)
283-
new_room = roomform.save(commit=False)
284-
new_room.meeting = meeting
285-
new_room.save()
286-
roomform.save_m2m()
287-
return HttpResponseRedirect( reverse(edit_timeslots, args=[meeting.number]) )
288-
289-
roomform = RoomForm(instance=room)
290-
meeting_base_url = request.build_absolute_uri(meeting.base_url())
291-
site_base_url = request.build_absolute_uri('/')[:-1] # skip the trailing slash
292-
return render(request, "meeting/room_edit.html",
293-
{"meeting_base_url": meeting_base_url,
294-
"site_base_url": site_base_url,
295-
"editroom": roomform,
296-
"meeting":meeting,
297-
"hide_menu": True,
298-
})
299271

300272
##############################################################################
301273
#@role_required('Area Director','Secretariat')

0 commit comments

Comments
 (0)