From 7dd596ecd67ebadd717ed07ba1d932f5c9690130 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz <henrik@levkowetz.com>
Date: Sat, 17 Jun 2017 17:08:55 +0000
Subject: [PATCH] Undid the last commit, made in error.  - Legacy-Id: 13666

---
 ietf/meeting/urls.py  |  1 +
 ietf/meeting/views.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/ietf/meeting/urls.py b/ietf/meeting/urls.py
index 8feab5090..d50c94ab7 100644
--- a/ietf/meeting/urls.py
+++ b/ietf/meeting/urls.py
@@ -43,6 +43,7 @@ type_ietf_only_patterns = [
     url(r'^timeslots/edit$',                     views.edit_timeslots),
     url(r'^rooms$',                              ajax.timeslot_roomsurl),
     url(r'^room/(?P<roomid>\d+).json$',          ajax.timeslot_roomurl),
+    url(r'^room/(?P<roomid>\d+)(?:.html)?/?$',          views.edit_roomurl),
     url(r'^timeslots$',                          ajax.timeslot_slotsurl),
     url(r'^timeslots.json$',                     ajax.timeslot_slotsurl),
     url(r'^timeslot/(?P<slotid>\d+).json$',      ajax.timeslot_sloturl),
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 56b232f04..946d84435 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -268,6 +268,34 @@ 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')