Merge registration into master, pull request #38.

This commit is contained in:
Tom Price
2015-05-23 22:12:17 +01:00
4 changed files with 21 additions and 3 deletions

View File

@@ -4,6 +4,7 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.conf import settings from django.conf import settings
from registration.backends.default.views import RegistrationView from registration.backends.default.views import RegistrationView
import RIGS import RIGS
from RIGS import regbackend
urlpatterns = patterns('', urlpatterns = patterns('',
# Examples: # Examples:
@@ -12,7 +13,7 @@ urlpatterns = patterns('',
url(r'^', include('RIGS.urls')), url(r'^', include('RIGS.urls')),
url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail), url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail),
name="registration_register"), name="registration_register"),
url('^user/', include('django.contrib.auth.urls')), url('^user/', include('django.contrib.auth.urls')),
url('^user/', include('registration.backends.default.urls')), url('^user/', include('registration.backends.default.urls')),

View File

@@ -16,7 +16,11 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
last_name = forms.CharField(required=False, max_length=50) last_name = forms.CharField(required=False, max_length=50)
initials = forms.CharField(required=True, max_length=5) initials = forms.CharField(required=True, max_length=5)
phone = forms.CharField(required=False, max_length=13) phone = forms.CharField(required=False, max_length=13)
captcha = ReCaptchaField() # captcha = ReCaptchaField()
class Meta:
model = models.Profile
fields = ('first_name','last_name','initials','phone')
def clean_initials(self): def clean_initials(self):
""" """

13
RIGS/regbackend.py Normal file
View File

@@ -0,0 +1,13 @@
from RIGS.models import Profile
from RIGS.forms import ProfileRegistrationFormUniqueEmail
def user_created(sender, user, request, **kwargs):
form = ProfileRegistrationFormUniqueEmail(request.POST)
user.first_name = form.data['first_name']
user.last_name = form.data['last_name']
user.initials = form.data['initials']
user.phone = form.data['phone']
user.save()
from registration.signals import user_registered
user_registered.connect(user_created)

View File

@@ -10,6 +10,7 @@ import simplejson
from django.contrib import messages from django.contrib import messages
import datetime import datetime
import operator import operator
from registration.views import RegistrationView
from RIGS import models, forms from RIGS import models, forms
@@ -33,7 +34,6 @@ def login(request, **kwargs):
return login(request, authentication_form=forms.LoginForm) return login(request, authentication_form=forms.LoginForm)
""" """
Called from a modal window (e.g. when an item is submitted to an event/invoice). Called from a modal window (e.g. when an item is submitted to an event/invoice).
May optionally also include some javascript in a success message to cause a load of May optionally also include some javascript in a success message to cause a load of