Merge lp:~cjohnston/summit/remove-lp-info-url into lp:summit

[Chris Johnston]

Removes Launchpad information link if there is no import_url

[lp:~cjohnston/summit/remove-lp-info-url]

543. By Adnane Belmadiaf on 2013-05-09

[r=cjohnston] Removed the twitter feed due to deprecated api

544. By Chris Johnston <email address hidden> on 2013-05-10

[r=joetalbott] Removes the landing page and does an automatic redirect to the next summit

545. By Chris Johnston <email address hidden> on 2013-05-10

[r=joetalbott] Creates a page that lists all meetings for an event

[Joe Talbott (joetalbott)]

For L18 and L175 I'd recommend using:

lp_link = SummitSprint.objects.filter(summit=summit).exists()

L93 you can put this sort of logic in setUp() and it'll get called for all tests. Maybe not what you want but it's an option to avoid the code duplication of calling create_summit() in a bunch of places.

[lp:~cjohnston/summit/remove-lp-info-url]

546. By Chris Johnston <email address hidden> on 2013-05-10

Fix per review

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[lp:~cjohnston/summit/remove-lp-info-url]

547. By Chris Johnston <email address hidden> on 2013-05-10

One last fix

[Joe Talbott (joetalbott)]

Looks good to me.

review: Approve

=== modified file 'summit/common/views.py'
--- summit/common/views.py	2013-05-10 02:14:42 +0000
+++ summit/common/views.py	2013-05-10 15:06:16 +0000
@@ -45,11 +45,6 @@
             ),
         )
     except IndexError:
-        #summit = Summit(name='no-summit', title='No Summit')
-
-        #context = {
-        #'summit': summit,
-        # }
         return render_to_response("common/no_summit.html")
 
 

=== modified file 'summit/schedule/templates/schedule/summit_info.html'
--- summit/schedule/templates/schedule/summit_info.html	2012-07-12 13:30:22 +0000
+++ summit/schedule/templates/schedule/summit_info.html	2013-05-10 15:06:16 +0000
@@ -6,4 +6,5 @@
 <strong>Ends:</strong> {{ summit.end|strftime:"%a, %d %b %Y %H:%M:%S %Z" }}</p>
 {% endif %}
 <p class="description">{{ summit.description|markdown:'safe' }}</p>
-<p><a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}"><img src="/media/img/gem-sm.png" alt="Launchpad" />Launchpad Information &rsaquo;</a></p>
+{% if lp_link %}
+<p><a class="launchpad" href="http://launchpad.net/sprints/{{ summit.name }}"><img src="/media/img/gem-sm.png" alt="Launchpad" />Launchpad information &rsaquo;</a></p>{% endif %}

=== modified file 'summit/schedule/tests/summit_model.py'
--- summit/schedule/tests/summit_model.py	2013-04-02 19:05:36 +0000
+++ summit/schedule/tests/summit_model.py	2013-05-10 15:06:16 +0000
@@ -21,6 +21,8 @@
 from model_mommy import mommy as factory
 from summit.schedule.fields import NameField
 from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+from django.test.client import Client
 
 from summit.schedule.models import (
     Summit,
@@ -44,6 +46,8 @@
 
 class SummitModelTestCase(djangotest.TestCase):
 
+    c = Client()
+
     def get_basic_launchpad_response(self):
         elem = LaunchpadExportNode()
         elem.add_child("attendees", LaunchpadExportNode())
@@ -595,3 +599,46 @@
             attendee.end_utc.replace(second=0, microsecond=0),
             end_summit.replace(second=0, microsecond=0),
         )
+
+    def load_summit_page(self, summit):
+        rev_args = [summit.name, ]
+        response = self.c.get(
+            reverse(
+                'summit.schedule.views.summit',
+                args=rev_args,
+            )
+        )
+        self.assertEqual(response.status_code, 200)
+
+        return response
+
+    def create_summit(self):
+        summit = factory.make_one(
+            Summit,
+            name="uds-test",
+            date_start="2013-05-09",
+            date_end="2013-05-10",
+        )
+
+        return summit
+
+    def test_summit_page_displays_lp_link(self):
+        """
+        Tests that the summit main page displays the Launchpad link when
+        one an import_url exists
+        """
+        summit = self.create_summit()
+        import_url = "http://launchpad"
+        factory.make_one(SummitSprint, summit=summit, import_url=import_url)
+        self.assertEqual([import_url], summit.launchpad_sprint_import_urls())
+        response = self.load_summit_page(summit)
+        self.assertContains(response, "Launchpad information")
+
+    def test_summit_page_does_not_index_displays_lp_link(self):
+        """
+        Tests that the summit main page does not display the Launchpad link
+        when one an import_url does not exist
+        """
+        summit = self.create_summit()
+        response = self.load_summit_page(summit)
+        self.assertNotContains(response, "Launchpad information")

=== modified file 'summit/schedule/tests/virtual.py'
--- summit/schedule/tests/virtual.py	2013-02-27 03:05:03 +0000
+++ summit/schedule/tests/virtual.py	2013-05-10 15:06:16 +0000
@@ -158,13 +158,13 @@
             post,
             redirect_url,
         )
-        redirect_responseonse = self.c.get(redirect_url)
+        redirect_response = self.c.get(redirect_url)
 
         # Verify that the new data appears on the meeting page
-        self.assertEqual(redirect_responseonse.status_code, 200)
-        self.assertIn(broadcast_url, redirect_responseonse.content)
-        self.assertIn(hangout_url, redirect_responseonse.content)
-        self.assertIn('Join the Hangout on Air', redirect_responseonse.content)
+        self.assertEqual(redirect_response.status_code, 200)
+        self.assertIn(broadcast_url, redirect_response.content)
+        self.assertIn(hangout_url, redirect_response.content)
+        self.assertIn('Join the Hangout on Air', redirect_response.content)
 
     def view_virtual_meeting_page(self):
         rev_args = [self.summit.name, self.meeting1.id, self.meeting1.name]

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2013-05-08 19:37:12 +0000
+++ summit/schedule/views.py	2013-05-10 15:06:16 +0000
@@ -39,7 +39,8 @@
     Meeting,
     Track,
     Room,
-    Participant
+    Participant,
+    SummitSprint,
 )
 
 from summit.schedule.render import schedule_factory, Schedule
@@ -68,15 +69,17 @@
 @summit_required
 def summit(request, summit, attendee):
     edit = False
-    if (summit.state != 'public'
-        and 'readonly' not in request.GET) \
-            or 'edit' in request.GET:
-        if request.user.is_authenticated() \
-                and summit.is_organizer(attendee):
+    if (
+        summit.state != 'public' and 'readonly' not in request.GET
+    ) or 'edit' in request.GET:
+        if request.user.is_authenticated() and summit.is_organizer(attendee):
             edit = True
     tracks = summit.track_set.all()
 
+    lp_link = SummitSprint.objects.filter(summit=summit).exists()
+
     context = {
+        'lp_link': lp_link,
         'summit': summit,
         'attendee': attendee,
         'edit': edit,

=== modified file 'summit/urls.py'
--- summit/urls.py	2013-05-08 19:37:12 +0000
+++ summit/urls.py	2013-05-10 15:06:16 +0000
@@ -25,7 +25,7 @@
 
 urlpatterns = patterns(
     '',
-    (r'^$', 'summit.common.views.index'),
+    url(r'^$', 'summit.common.views.index', name="index"),
     (r'^admin/', admin.site.urls),
     (r'^api/', include('services.urls')),
 )
@@ -65,7 +65,7 @@
     url(r'^today/(?P<summit_name>[\w-]+)/$', 'today_view', name='today'),
     url(r'^past/', 'past', name='past'),
     url(r'^logout$', 'logout_view', name='logout'),
-    (r'^(?P<summit_name>[\w-]+)/$', 'summit'),
+    url(r'^(?P<summit_name>[\w-]+)/$', 'summit', name='summit'),
     (r'^(?P<summit_name>[\w-]+)/mobile/$', 'mobile'),
     (r'^(?P<summit_name>[\w-]+)/search/$', 'search'),
     url(