Merge lp:~mhall119/summit/schedule-specific-rooms into lp:summit

[Michael Hall]

Allows a simple ?rooms= query string variable with a list of room name-slugs on the date view of the schedule.

Allows a simple ?rooms= query string variable with a list of room name-slugs on the date view of the schedule.

Private rooms can be included in this list, but they will only be shown if the user has access to view private rooms, otherwise they are ignored.

[lp:~mhall119/summit/schedule-specific-rooms]

199. By Michael Hall on 2011-10-18

Added test case

[James Westby (james-w)]

review: Approve

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2011-09-30 21:43:02 +0000
+++ summit/schedule/render.py	2011-10-18 13:54:23 +0000
@@ -88,7 +88,10 @@
             date = None
             dates = summit.dates()
 
-        if room is not None:
+        if isinstance(room, (list, tuple)):
+            rooms = room
+            room = None
+        elif room is not None:
             room = room
             rooms = [room]
         else:
 
=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2011-09-22 22:08:26 +0000
+++ summit/schedule/tests.py	2011-10-18 13:54:23 +0000
@@ -812,7 +812,7 @@
             summit=self.summit)
 
         self.track1 = factory.make_one(Track, summit=self.summit)
-        self.room1 = factory.make_one(Room, summit=self.summit)
+        self.room1 = factory.make_one(Room, summit=self.summit, name='room1')
         self.meeting1 = factory.make_one(Meeting, summit=self.summit, name='meeting1', private=False, requires_dial_in=False)
         self.agenda1 = factory.make_one(Agenda, slot=self.slot, meeting=self.meeting1, room=self.room1)
 
@@ -917,6 +917,36 @@
         self.assertContains(response, 'test%user', 2)
         self.assertContains(response, 'Test % User', 1)
 
+    def test_specify_rooms_in_schedule(self):
+        room2 = factory.make_one(Room, summit=self.summit, name='room2', title='Room 2')
+        self.room1.title = 'Room 1'
+        self.room1.save()
+        self.agenda1.delete()
+        
+        schedule_args = [self.summit.name, self.agenda1.slot.start_utc.date()]
+        schedule_url = reverse('summit.schedule.views.by_date', args=schedule_args)
+
+        response = self.client.get(schedule_url)
+        self.assertContains(response, self.room1.title, 2)
+        self.assertContains(response, room2.title, 2)
+
+        response = self.client.get(schedule_url + '?rooms=room1')
+        self.assertContains(response, self.room1.title, 2)
+        self.assertContains(response, room2.title, 0)
+        
+        response = self.client.get(schedule_url + '?rooms=room2')
+        self.assertContains(response, self.room1.title, 0)
+        self.assertContains(response, room2.title, 2)
+        
+        response = self.client.get(schedule_url + '?rooms=room1,room2')
+        self.assertContains(response, self.room1.title, 2)
+        self.assertContains(response, room2.title, 2)
+        
+        response = self.client.get(schedule_url + '?rooms=unknown1,unknown2')
+        self.assertContains(response, self.room1.title, 0)
+        self.assertContains(response, room2.title, 0)
+        
+
 
 class ScheduleCacheTestCase(djangotest.TestCase):
 
 
=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2011-09-21 12:08:21 +0000
+++ summit/schedule/views.py	2011-10-18 13:54:23 +0000
@@ -109,7 +109,14 @@
     return _process_date_view(request, summit, attendee, today.strftime("%Y-%m-%d"))
 
 def _process_date_view(request, summit, attendee, date):
-    schedule = schedule_factory(request, summit, attendee, date=date)
+    if 'rooms' in request.GET:
+        roomnames = request.GET.get('rooms', '').split(',')
+        rooms = list(summit.room_set.filter(name__in=roomnames, type='open'))
+        if request.user.is_authenticated() and request.user.is_staff:
+            rooms += list(summit.room_set.filter(name__in=roomnames, type='private'))
+    else:
+        rooms = None
+    schedule = schedule_factory(request, summit, attendee, room=rooms, date=date)
 
     if request.method == 'POST':
         return schedule.save_change()