Merge lp:~michael.nelson/ubuntu-webcatalog/fix-admin-template into lp:ubuntu-webcatalog

[Michael Nelson]

Update custom admin/login.html so that we're not using a templatetag library no longer available in django 1.5.

The /admin/ url was 500ing on staging after deploy. Turns out it's because we've got an admin/login.html template that uses an admin templatetag library that is no longer available in django 1.5. It wasn't obvious in our dev environment, because this admin template wasn't found (staging/prod has the template_dirs setting, which we didn't have locally, which enables the admin template to be found in the non-admin template dir).

fab test:pg=true

[Łukasz Czyżykowski (lukasz-czyzykowski)]

review: Approve

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2013-04-23 07:32:27 +0000
+++ django_project/config/main.cfg	2013-04-26 14:31:27 +0000
@@ -41,6 +41,10 @@
                    django.template.loaders.app_directories.Loader
                    django.template.loaders.eggs.Loader
 
+# This enables the admin app to find webcatalog/templates/admin like the
+# staging/prod configs. Comment out to login normally on the dev server.
+template_dirs = src/webcatalog/templates
+
 secret_key = eepu9Av5ixage9ahhodovahfaiFoorodahf6keip3eichaeW9f
 template_debug = %(debug)s
 time_zone = Europe/London
 
=== modified file 'src/webcatalog/templates/admin/login.html'
--- src/webcatalog/templates/admin/login.html	2011-08-10 18:58:04 +0000
+++ src/webcatalog/templates/admin/login.html	2013-04-26 14:31:27 +0000
@@ -1,7 +1,7 @@
 {% extends "admin/base_site.html" %}
-{% load i18n %}
+{% load i18n admin_static %}
 
-{% block extrastyle %}<link rel="stylesheet" type="text/css" href="{% load adminmedia %}{% admin_media_prefix %}css/login.css" />{% endblock %}
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}" />{% endblock %}
 
 {% block bodyclass %}login{% endblock %}
 
 
=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2013-04-09 13:53:18 +0000
+++ src/webcatalog/tests/test_views.py	2013-04-26 14:31:27 +0000
@@ -43,6 +43,7 @@
 
 __metaclass__ = type
 __all__ = [
+    'AdminLoginTestCase',
     'ApplicationDetailNoSeriesTestCase',
     'ApplicationDetailTestCase',
     'ApplicationListTestCase',
@@ -1454,3 +1455,12 @@
         expected = {"status": "PENDING", "traceback": None, "id": "cafe"}
 
         self.assertEqual(expected, data)
+
+
+class AdminLoginTestCase(TestCase):
+
+    def test_unauthed_admin_renders(self):
+        response = self.client.get('/admin/')
+
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, 'action="/openid/login/"')