Merge lp:~nigelbabu/summit/common-app into lp:summit

[Nigel Babu]

Created a common app and moved login_failure into it

Created a common app and moved login_failure into it

[Chris Johnston (cjohnston)]

review: Approve

=== added directory 'summit/common'
=== added file 'summit/common/__init__.py'
=== added file 'summit/common/views.py'
--- summit/common/views.py	1970-01-01 00:00:00 +0000
+++ summit/common/views.py	2011-11-08 19:19:26 +0000
@@ -0,0 +1,50 @@
+# Ubuntu Developer Summit web application
+# Copyright (C) 2008, 2009, 2010 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# 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.template.loader import render_to_string
+from django.template import RequestContext
+from django.http import HttpResponse, HttpResponseRedirect
+
+try:
+    from django_openid_auth.exceptions import (
+        MissingPhysicalMultiFactor,
+        MissingUsernameViolation,
+    )
+
+except ImportError:
+    MissingPhysicalMultiFactor = None
+    MissingUsernameViolation = None
+
+
+
+def login_failure(request, message, status=403,
+        template_name='login_failure.html',
+        exception=None):
+    """Render an error page to the user."""
+    context = {
+        'message': message,
+        'exception': exception,
+    }
+    if isinstance(exception, MissingPhysicalMultiFactor):
+        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 Summit'
+ 
+    data = render_to_string(template_name, context,
+        context_instance=RequestContext(request))
+    return HttpResponse(data, status=status)
+

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2011-10-31 16:17:02 +0000
+++ summit/schedule/views.py	2011-11-08 19:19:26 +0000
@@ -23,7 +23,6 @@
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
-from django.template.loader import render_to_string
 
 from summit.schedule.decorators import (summit_required,
                                         summit_only_required,
@@ -45,15 +44,6 @@
     'today_view',
 )
 
-try:
-    from django_openid_auth.exceptions import (
-        MissingPhysicalMultiFactor,
-        MissingUsernameViolation,
-    )
-
-except ImportError:
-    MissingPhysicalMultiFactor = None
-    MissingUsernameViolation = None
 
 def index(request):
     summit = Summit.objects.next()
@@ -64,22 +54,6 @@
     return render_to_response("schedule/index.html", context,
                               context_instance=RequestContext(request))
 
-def login_failure(request, message, status=403,
-        template_name='login_failure.html',
-        exception=None):
-    """Render an error page to the user."""
-    context = {
-        'message': message,
-        'exception': exception,
-    }
-    if isinstance(exception, MissingPhysicalMultiFactor):
-        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 Summit'
- 
-    data = render_to_string(template_name, context,
-        context_instance=RequestContext(request))
-    return HttpResponse(data, status=status)
 
 @summit_required
 def summit(request, summit, attendee):

=== modified file 'summit/settings.py'
--- summit/settings.py	2011-11-06 22:06:57 +0000
+++ summit/settings.py	2011-11-08 19:19:26 +0000
@@ -148,6 +148,7 @@
     'django.contrib.admin',
     'summit.schedule',
     'summit.sponsor',
+    'summit.common',
     'south',
 ]
 

=== modified file 'summit/urls.py'
--- summit/urls.py	2011-11-08 16:42:45 +0000
+++ summit/urls.py	2011-11-08 19:19:26 +0000
@@ -18,7 +18,7 @@
 from django.conf import settings
 import ubuntu_website
 
-from schedule.views import login_failure
+from common.views import login_failure
 
 from django.contrib import admin
 admin.autodiscover()