Merge lp:~mhall119/summit/custom-registration-form into lp:summit

[Michael Hall]

Add settings.REGISTRATION_FORM_VIEW for registration override

Allows different deployments to provide their own user registration form
views by adding a setting value to their local settings. If no setting is
given, it will default back to the Attendee form previously used

Add settings.REGISTRATION_FORM_VIEW for registration override

Allows different deployments to provide their own user registration form
views by adding a setting value to their local settings. If no setting is
given, it will default back to the Attendee form previously used

[Chris Johnston (cjohnston)]

I would really prefer that we don't use '\' to extend a line.. could you do:

if (one and two and
       three and four):

[lp:~mhall119/summit/custom-registration-form]

569. By Michael Hall on 2014-04-23

Don't use escaped newlines for multi-line if condition

[Chris Johnston (cjohnston)]

summit/schedule/views.py:1213:52: W291 trailing whitespace
summit/schedule/views.py:1214:5: E128 continuation line under-indented for visual indent
summit/schedule/views.py:1214:52: W291 trailing whitespace
summit/schedule/views.py:1215:5: E128 continuation line under-indented for visual indent
summit/schedule/views.py:1215:80: E501 line too long (94 > 79 characters)
summit/schedule/views.py:1224:1: E302 expected 2 blank lines, found 1

Unmerged revisions

569. By Michael Hall on 2014-04-23

Don't use escaped newlines for multi-line if condition

568. By Michael Hall on 2014-04-15

Add settings.REGISTRATION_FORM_VIEW for registration override

Allows different deployments to provide their own user registration form
views by adding a setting value to their local settings. If no setting is
given, it will default back to the Attendee form previously used

=== modified file 'requirements.txt'
--- requirements.txt	2014-04-15 01:02:18 +0000
+++ requirements.txt	2014-04-23 01:37:56 +0000
@@ -19,6 +19,7 @@
 simplejson==2.0.9
 wsgiref==0.1.2
 model-mommy==0.8.1
+mock>=1.0
 Markdown==2.1.1
 pylint
 

=== modified file 'summit/schedule/tests/registration.py'
--- summit/schedule/tests/registration.py	2013-04-06 15:09:33 +0000
+++ summit/schedule/tests/registration.py	2014-04-23 01:37:56 +0000
@@ -29,6 +29,8 @@
     Attendee,
 )
 
+from mock import MagicMock, patch
+from django.conf import settings
 
 class RegistrationTestCase(djangotest.TestCase):
     """
@@ -62,6 +64,8 @@
         )
         self.user1.set_password('password')
         self.user1.save()
+        
+        self.OLD_REGISTRATION_FORM_VIEW = getattr(settings, 'REGISTRATION_FORM_VIEW', None)
 
     def create_attendee(self):
         self.attendee1 = factory.make_one(
@@ -74,6 +78,7 @@
 
     def tearDown(self):
         self.client.logout()
+        settings.REGISTRATION_FORM_VIEW = self.OLD_REGISTRATION_FORM_VIEW
 
     def login(self):
         logged_in = self.c.login(
@@ -270,3 +275,24 @@
             response.content
         )
         self.assertIn('Register in Summit', response.content)
+
+    def test_registration_view_override(self):
+        """
+        Test that registration form view overrides in settings are being
+        used
+        """
+        self.login()
+        rev_args = [self.summit.name, ]
+        with patch('summit.schedule.tests.registration.registration_form_test') as mock_form:
+            settings.REGISTRATION_FORM_VIEW = 'summit.schedule.tests.registration.registration_form_test'
+            mock_form.side_effect = registration_form_side_effect
+            self.assertFalse(mock_form.called)
+            response = self.c.get(reverse('registration', args=rev_args))
+            self.assertTrue(mock_form.called)
+
+def registration_form_side_effect(request, summit, attendee):
+    from summit.schedule.views import default_registration_form
+    return default_registration_form(request, summit, attendee)
+
+registration_form_test = None
+

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2013-11-05 20:56:44 +0000
+++ summit/schedule/views.py	2014-04-23 01:37:56 +0000
@@ -16,6 +16,9 @@
 
 import datetime
 
+from importlib import import_module
+from django.conf import settings
+
 from django.db.models import Q
 from django.contrib.auth import logout
 from django.http import Http404, HttpResponse, HttpResponseRedirect
@@ -1207,6 +1210,18 @@
 @login_required
 @summit_required
 def registration_form(request, summit, attendee):
+    if (hasattr(settings, 'REGISTRATION_FORM_VIEW') 
+    and settings.REGISTRATION_FORM_VIEW is not None 
+    and settings.REGISTRATION_FORM_VIEW != 'summit.schedule.views.default_registration_form'):
+        p, m = settings.REGISTRATION_FORM_VIEW.rsplit('.', 1)
+
+        mod = import_module(p)
+        form_method = getattr(mod, m)
+        return form_method(request, summit, attendee)
+    else:
+        return default_registration_form(request, summit, attendee)
+
+def default_registration_form(request, summit, attendee):
     registration_args = dict()
 
     if attendee is None: