From db9ceb3f45367233a9fa1c04ace6266b3026a17f Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sat, 17 Jun 2017 17:07:23 +0000 Subject: [PATCH] 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 --- ietf/meeting/urls.py | 1 - ietf/meeting/views.py | 28 ---------------------------- 2 files changed, 29 deletions(-) diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py index d50c94ab7..8feab5090 100644 --- a/ietf/meeting/urls.py +++ b/ietf/meeting/urls.py @@ -43,7 +43,6 @@ type_ietf_only_patterns = [ url(r'^timeslots/edit$', views.edit_timeslots), url(r'^rooms$', ajax.timeslot_roomsurl), url(r'^room/(?P\d+).json$', ajax.timeslot_roomurl), - url(r'^room/(?P\d+)(?:.html)?/?$', views.edit_roomurl), url(r'^timeslots$', ajax.timeslot_slotsurl), url(r'^timeslots.json$', ajax.timeslot_slotsurl), url(r'^timeslot/(?P\d+).json$', ajax.timeslot_sloturl), diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 946d84435..56b232f04 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -268,34 +268,6 @@ class RoomForm(ModelForm): model = Room exclude = ('meeting',) -@role_required('Secretariat') -def edit_roomurl(request, num, roomid): - log.unreachable("07 Mar 2017") - meeting = get_meeting(num) - - try: - room = meeting.room_set.get(pk=roomid) - except Room.DoesNotExist: - raise Http404("No room %u for meeting %s" % (roomid, meeting.name)) - - if request.POST: - roomform = RoomForm(request.POST, instance=room) - new_room = roomform.save(commit=False) - new_room.meeting = meeting - new_room.save() - roomform.save_m2m() - return HttpResponseRedirect( reverse(edit_timeslots, args=[meeting.number]) ) - - roomform = RoomForm(instance=room) - meeting_base_url = request.build_absolute_uri(meeting.base_url()) - site_base_url = request.build_absolute_uri('/')[:-1] # skip the trailing slash - return render(request, "meeting/room_edit.html", - {"meeting_base_url": meeting_base_url, - "site_base_url": site_base_url, - "editroom": roomform, - "meeting":meeting, - "hide_menu": True, - }) ############################################################################## #@role_required('Area Director','Secretariat')