Merge lp:~mhall119/summit/fixes-814375 into lp:~summit-hackers/summit/1.x

[Michael Hall]

Adds the meeting id to the meeting_page_url, and uses only that as the lookup parameter

Overview
========
Meeting names are neither required nor unique, but they were being used as identifiers in the meeting_page_url, throwing errors whenever there wasn't a unique match.

Details
=======
This code adds the meeting id as a part of the URL, and only uses that to perform lookups to find the appropriate meeting. The meeting name is still present in the URL, to make it reader friendly, but it is ignored by the system. If a meeting does not have a name, a single hyphen is used in it's place.

[Nigel Babu (nigelbabu)]

Tests pass. Looks good. Approved!

review: Approve

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2011-07-20 20:50:38 +0000
+++ summit/schedule/models/meetingmodel.py	2011-07-22 01:37:27 +0000
@@ -124,9 +124,10 @@
 
     def get_meeting_page_url(self):
         if self.name is None or self.name == '':
-            return ''
-        name = self.name.replace('.','-')
-        args = [self.summit.name, name]
+            name = '-'
+        else:
+            name = self.name.replace('.','-')
+        args = [self.summit.name, self.id, name]
         return reverse('summit.schedule.views.meeting', args=args)
     meeting_page_url = property(get_meeting_page_url)
 
 
=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2011-05-22 18:52:49 +0000
+++ summit/schedule/render.py	2011-07-22 01:37:27 +0000
@@ -714,7 +714,7 @@
             if should_have_details_link:
                 html += (('<a href="%s"><img src="%simg/pad.png" ' +
                           'title="%s" alt="(%s)" height="16" width="16"/></a>\n')
-                         % ("/"+escape(self.summit.name)+"/meeting/"+escape(meeting.name), settings.MEDIA_URL
+                         % (meeting.meeting_page_url, settings.MEDIA_URL
                           , "meeting details", "meeting details"))
 
             if icon:
 
=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2011-07-20 17:41:32 +0000
+++ summit/schedule/tests.py	2011-07-22 01:37:27 +0000
@@ -19,6 +19,7 @@
 import unittest
 from django.core.management.base import CommandError
 from django import test as djangotest
+from django.core.urlresolvers import reverse
 
 from summit.schedule.management.commands import reschedule
 from summit.schedule.models import *
@@ -83,11 +84,11 @@
         meeting = factory.make_one(Meeting, summit=summit, name='')
         agenda = factory.make_one(Agenda, slot=slot, meeting=meeting, room=room)
         
-        self.assertEquals(meeting.meeting_page_url, '')
+        self.assertEquals(meeting.meeting_page_url, '/uds-test/meeting/%s/-/' % meeting.id)
         
         response = self.client.get('/uds-test.ical')
         self.assertEquals(response.status_code, 200)
-        self.assertContains(response, 'URL:http://summit.ubuntu.com\n', 1)
+        self.assertContains(response, 'URL:http://summit.ubuntu.com/uds-test/meeting/%s/-/\n' % meeting.id, 1)
 
     def test_ical_meeting_name_with_period(self):
         """ Tests that ical doesn't break for nameless meetings"""
@@ -107,9 +108,46 @@
         meeting = factory.make_one(Meeting, summit=summit, name='test.name')
         agenda = factory.make_one(Agenda, slot=slot, meeting=meeting, room=room)
         
-        self.assertEquals(meeting.meeting_page_url, '/uds-test/meeting/test-name/')
-        
-        response = self.client.get('/uds-test.ical')
-        self.assertEquals(response.status_code, 200)
-        self.assertContains(response, 'URL:http://summit.ubuntu.com/uds-test/meeting/test-name/', 1)
+        self.assertEquals(meeting.meeting_page_url, '/uds-test/meeting/%s/test-name/' % meeting.id)
+        
+        response = self.client.get('/uds-test.ical')
+        self.assertEquals(response.status_code, 200)
+        self.assertContains(response, 'URL:http://summit.ubuntu.com/uds-test/meeting/%s/test-name/' % meeting.id, 1)
+
+class MeetingPageTestCase(djangotest.TestCase):
+
+    def test_meeting_page_url(self):
+        """ Tests the creation and reverse lookup of meeting page urls"""
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        summit = factory.make_one(Summit, name='uds-test')
+        summit.save()
+        slot = factory.make_one(
+            Slot,
+            start_utc=now,
+            end_utc=now+one_hour,
+            type='open',
+            summit=summit)
+        slot.save()
+        
+        room = factory.make_one(Room, summit=summit)
+        meeting = factory.make_one(Meeting, summit=summit, name='test-meeting')
+        agenda = factory.make_one(Agenda, slot=slot, meeting=meeting, room=room)
+
+        # check meeting page url generation
+        self.assertEquals(meeting.meeting_page_url, '/uds-test/meeting/%s/test-meeting/' % meeting.id)
+        
+        # check meeting page url reverse lookup
+        rev_args = ['uds-test', 1, 'test-meeting']
+        reverse_url = reverse('summit.schedule.views.meeting', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/meeting/%s/test-meeting/' % meeting.id)
+        
+        # check meeting details page
+        response = self.client.get(reverse_url)
+        self.assertEquals(response.status_code, 200)
+
+        # check meeting in ical
+        response = self.client.get('/uds-test.ical')
+        self.assertEquals(response.status_code, 200)
+        self.assertContains(response, 'URL:http://summit.ubuntu.com/uds-test/meeting/%s/test-meeting/' % meeting.id, 1)
 
 
=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2011-07-18 00:44:27 +0000
+++ summit/schedule/views.py	2011-07-22 01:37:27 +0000
@@ -198,8 +198,8 @@
                               context_instance=RequestContext(request))
 
 @summit_required
-def meeting(request, summit, attendee, meeting_slug):
-    meeting = get_object_or_404(summit.meeting_set, name__iexact=meeting_slug)
+def meeting(request, summit, attendee, meeting_id, meeting_slug):
+    meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
     agendaitems=meeting.agenda_set.all()
     participants=meeting.participant_set.all()
     tracks=meeting.tracks.all()
 
=== modified file 'summit/urls.py'
--- summit/urls.py	2011-07-17 23:43:09 +0000
+++ summit/urls.py	2011-07-22 01:37:27 +0000
@@ -63,7 +63,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_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/(?P<username>[\w-]+)\.ical$', 'user_ical'),