Merge lp:~james-w/summit/fix-plus-in-meeting-name into lp:summit

[James Westby]

Allow "+" in a meeting name without crashing on the url lookup.

Hi,

Another fix for an unexpected character in the meeting name.

Thanks,

James

[Michael Hall (mhall119)]

Looks good, maybe this should be added to track and room urlconfs too?

review: Approve

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2011-09-18 02:36:26 +0000
+++ summit/schedule/tests.py	2011-09-19 16:28:25 +0000
@@ -342,6 +342,12 @@
         reverse_url = reverse('summit.schedule.views.meeting', args=rev_args)
         self.assertEquals(reverse_url, '/uds-test/meeting/%s/test%%meeting/' % meeting.id)
 
+    def test_meeting_name_with_plus_sign(self):
+        meeting = factory.make_one(Meeting, summit=self.summit, name='test.meeting')
+        rev_args = ['uds-test', meeting.id, 'test+meeting']
+        reverse_url = reverse('summit.schedule.views.meeting', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/meeting/%s/test+meeting/' % meeting.id)
+
     def test_room_name_with_percent(self):
         ''' Test the following Room urlconfs
         (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[\.\w-]+)/$', 'by_room'),

=== modified file 'summit/urls.py'
--- summit/urls.py	2011-09-17 18:47:05 +0000
+++ summit/urls.py	2011-09-19 16:28:25 +0000
@@ -66,7 +66,7 @@
     (r'^(?P<summit_name>[\w-]+)/(?P<date>[\d-]+)/$', 'by_date'),
     (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[%\.\w-]+)/$', 'by_room'),
     (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%\.\w-]+)/$', 'by_track'),
-    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%\.\w-]+)/$', 'meeting'),
+    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'meeting'),
     (r'^(?P<summit_name>[\w-]+)\.csv$', 'csv'),
     (r'^(?P<summit_name>[\w-]+)\.ical$', 'ical'),
     (r'^(?P<summit_name>[\w-]+)/participant/my_schedule_(?P<secret_key>[0-9a-f]{32})\.ical$', 'user_private_ical'),