Merge lp:~mhall119/summit/fix-edit-meeting-link-1248193 into lp:summit

[Michael Hall]

Change virtual_meeting.html to display organizer edit link when the user is both the drafter and organizer

Change virtual_meeting.html to display organizer edit link when the user is both the drafter and organizer

[Joe Talbott (joetalbott)]

Your description says "drafter and organizer" but the logic seems to be that someone could be organizer but not drafter and still get the organizer edit link based on the 'or' on L7.

I'd recommend adding a test that ensures the link isn't shown when it should not be as well.

[Michael Hall (mhall119)]

Yes, if the user is an organizer (whether they are drafter or not) they should get the organizer's link.

[Joe Talbott (joetalbott)]

review: Approve

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/schedule/templates/schedule/virtual_meeting.html'
--- summit/schedule/templates/schedule/virtual_meeting.html	2013-05-14 14:21:15 +0000
+++ summit/schedule/templates/schedule/virtual_meeting.html	2013-11-05 19:02:20 +0000
@@ -39,10 +39,9 @@
         <li><a class="sub-nav-item" href="{{ meeting.spec_url }}">Blueprint</a></li>
     {% else %}
         {% if summit_organizer or drafter %}
-            {% if not drafter %}
+            {% if summit_organizer %}
                 <li><a class="sub-nav-item" href="{% url summit.schedule.views.organizer_edit_meeting summit.name, meeting.id, meeting.name|default:'-' %}">Edit meeting</a></li>
-            {% endif %}
-            {% if not summit_organizer %}
+            {% else %}
                 <li><a class="sub-nav-item" href="{% url summit.schedule.views.edit_meeting summit.name, meeting.id, meeting.name|default:'-' %}">Edit meeting</a></li>
             {% endif %}
             <li><a class="sub-nav-item" href="{% url summit.schedule.views.attendee_review summit.name, meeting.id, meeting.name|default:'-' %}">Review attendees</a></li>

=== modified file 'summit/schedule/tests/meeting_page.py'
--- summit/schedule/tests/meeting_page.py	2013-02-27 03:29:31 +0000
+++ summit/schedule/tests/meeting_page.py	2013-11-05 19:02:20 +0000
@@ -19,6 +19,7 @@
 from django import test as djangotest
 from django.core.urlresolvers import reverse
 from django.conf import settings
+from django.contrib.auth.models import User
 
 from model_mommy import mommy as factory
 from summit.schedule.fields import NameField
@@ -29,6 +30,9 @@
     Meeting,
     Room,
     Agenda,
+    Attendee,
+    Track,
+    Lead,
 )
 
 site_root = getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com')
@@ -99,3 +103,92 @@
             ),
             1
         )
+
+    def test_edit_link_for_both_drafter_and_organizer(self):
+        """ Tests that the edit meeting link is present when the user is both drafter and organizer """
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        summit = factory.make_one(Summit, name='uds-test', virtual_summit=True)
+        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',
+            private=False
+        )
+        agenda = factory.make_one(
+            Agenda,
+            slot=slot,
+            meeting=meeting,
+            room=room
+        )
+
+        user = factory.make_one(
+            User,
+            username='testuser',
+            first_name='Test',
+            last_name='User',
+            is_active=True,
+            is_staff=False,
+            is_superuser=False,
+        )
+        user.set_password('password')
+        user.save()
+        attendee = factory.make_one(
+            Attendee,
+            summit=summit,
+            user=user,
+            start_utc=now,
+            end_utc=now+one_hour
+        )
+        meeting.drafter = attendee
+        meeting.save()
+        track = factory.make_one(
+            Track,
+            summit=summit,
+        )
+        lead = factory.make_one(
+            Lead,
+            summit=summit,
+            track=track,
+            lead=attendee,
+        )
+        
+
+        logged_in = self.client.login(username='testuser', password='password')
+        self.assertTrue(logged_in)
+
+        # 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', 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
+        )
+
+        # check meeting details page
+        response = self.client.get(reverse_url)
+        self.assertEquals(response.status_code, 200)
+
+        self.assertContains(
+            response,
+            'Edit meeting',
+            1
+        )