Merge lp:~cjohnston/summit/add-summit-index-redirect into lp:summit

[Chris Johnston]

Removes the landing page and does an automatic redirect to the next summit

This creates a redirect so that when hitting / you are redirected to the next summit event.

Also provides an error page if there is no summit.

[lp:~cjohnston/summit/add-summit-index-redirect]

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

Add no_summit.html

[Joe Talbott (joetalbott)]

Looks good to me.

review: Approve

=== removed file 'summit/common/templates/common/index.html'
--- summit/common/templates/common/index.html	2012-04-23 14:07:02 +0000
+++ summit/common/templates/common/index.html	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-{% extends "base.html" %}
-{% load datetime %}
-
-{% block page_name %}Home{%endblock %}
-{% block extrahead %}
-{{ block.super }}
-{% endblock %}
-
-{% block sub_nav %}{% endblock %}
-
-{% block content %}
-<div class="row">
-<article class="span-12">
-    {% if summit %}
-    <h1><a href="/{{ summit.name }}">{{ summit.title }} &rsaquo;</a></h1>
-      {% include "schedule/summit_info.html" %}
-    {% else %}
-    <p>No summits registered.</p>
-    {% endif %}
-</article>
-</div>
-{% endblock %}
-{% block closure %}
-<style>
-/* Mobile-friendly styles */
-@media screen and (max-width: 960px) {
-    .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary { display: none; }
-    #page-header { text-align: center; }
-    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
-    .span-8, .span-9, .span-3, .span-12 { width: 100%; }
-    #fb-root * { width: auto; }
-}
-</style>
-{% endblock %}
-
 
=== added file 'summit/common/templates/common/no_summit.html'
--- summit/common/templates/common/no_summit.html	1970-01-01 00:00:00 +0000
+++ summit/common/templates/common/no_summit.html	2013-05-10 13:47:31 +0000
@@ -0,0 +1,30 @@
+{% extends "base.html" %}
+
+{% block page_name %}Home{%endblock %}
+{% block extrahead %}
+{{ block.super }}
+{% endblock %}
+
+{% block sub_nav %}{% endblock %}
+
+{% block content %}
+<div class="row">
+<article class="span-12">
+    <h1>No summit found!</h1>
+    <p>If you believe you have found this page in error, please <a href="https://bugs.launchpad.net/summit/+filebug">File a bug</a>.</p>
+</article>
+</div>
+{% endblock %}
+{% block closure %}
+<style>
+/* Mobile-friendly styles */
+@media screen and (max-width: 960px) {
+    .span-4, footer, #main-nav, footer .logo-ubuntu, .nav-secondary { display: none; }
+    #page-header { text-align: center; }
+    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
+    .span-8, .span-9, .span-3, .span-12 { width: 100%; }
+    #fb-root * { width: auto; }
+}
+</style>
+{% endblock %}
+
 
=== modified file 'summit/common/tests.py'
--- summit/common/tests.py	2013-05-09 19:24:33 +0000
+++ summit/common/tests.py	2013-05-10 13:47:31 +0000
@@ -18,11 +18,12 @@
 import datetime
 from django import test as djangotest
 from model_mommy import mommy as factory
+from django.core.urlresolvers import reverse
+from django.contrib.sites.models import Site
+
 from summit.schedule.fields import NameField
-
 from summit.schedule.models import Summit
 from summit.common.models import Menu
-from django.contrib.sites.models import Site
 
 # Monkey-patch our NameField into the types of fields that the factory
 # understands.  This is simpler than trying to subclass the Mommy
@@ -106,3 +107,61 @@
             'href="/today/uds-test/" title="Today">Today</a>',
             0,
         )
+
+
+class IndexRedirectTestCase(djangotest.TestCase):
+
+    def test_index_redirects_correct_summit(self):
+        """
+        Test that when loading / it redirects to the newest summit event
+        """
+        site = factory.make_one(Site, id=1)
+        summit1 = factory.make_one(
+            Summit,
+            name='uds-test1',
+            date_start='2011-05-10',
+            date_end='2011-05-15',
+        )
+        summit1.sites.add(site)
+        summit2 = factory.make_one(
+            Summit,
+            name='uds-test2',
+            date_start='2013-05-10',
+            date_end='2013-05-15',
+        )
+        summit2.sites.add(site)
+        summit3 = factory.make_one(
+            Summit,
+            name='uds-test3',
+            date_start='2012-05-10',
+            date_end='2012-05-15',
+        )
+        summit3.sites.add(site)
+        index = self.client.get(
+            reverse(
+                'summit.common.views.index',
+            ),
+        )
+        response = reverse(
+            'summit.schedule.views.summit',
+            args=(summit2.name,)
+        )
+        self.assertRedirects(
+            index,
+            response,
+        )
+        response = self.client.get(response)
+        self.assertContains(response, summit2.title)
+
+    def test_no_summit_no_redirect(self):
+        """
+        Tests that if a summit does not exist, the index page displays a
+        no summit page, not redirects
+        """
+        index = self.client.get(
+            reverse(
+                'summit.common.views.index',
+            ),
+        )
+        self.assertEqual(index.status_code, 200)
+        self.assertTemplateUsed(index, 'common/no_summit.html')
 
=== modified file 'summit/common/views.py'
--- summit/common/views.py	2013-02-26 19:31:21 +0000
+++ summit/common/views.py	2013-05-10 13:47:31 +0000
@@ -14,10 +14,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from django.shortcuts import render_to_response
+from django.shortcuts import render_to_response, redirect
 from django.template.loader import render_to_string
 from django.template import RequestContext
 from django.http import HttpResponse
+from django.core.urlresolvers import reverse
 
 from summit.schedule.models import Summit
 
@@ -35,14 +36,22 @@
 def index(request):
     try:
         summit = Summit.on_site.all().order_by('-date_start')[0]
+        print summit.name
+        args = [summit.name, ]
+        return redirect(
+            reverse(
+                "summit.schedule.views.summit",
+                args=args,
+            ),
+        )
     except IndexError:
-        summit = Summit(name='no-summit', title='No Summit')
-
-    context = {
-        'summit': summit,
-    }
-    return render_to_response("common/index.html", context,
-                              context_instance=RequestContext(request))
+        #summit = Summit(name='no-summit', title='No Summit')
+
+        #context = {
+        #'summit': summit,
+        # }
+        return render_to_response("common/no_summit.html")
+
 
 def login_failure(request, message, status=403,
         template_name='login_failure.html',
@@ -56,8 +65,7 @@
         context['solution'] = 'Try logging in again using your Yubikey'
     elif isinstance(exception, MissingUsernameViolation):
         context['solution'] = 'You will need to create a <a href="https://launchpad.net/people/+me">Launchpad profile</a> to use The Summit Scheduler'
- 
+
     data = render_to_string(template_name, context,
         context_instance=RequestContext(request))
     return HttpResponse(data, status=status)
-