diff --git a/PyRIGS/urls.py b/PyRIGS/urls.py index 82d0c209..a4c8e2a3 100644 --- a/PyRIGS/urls.py +++ b/PyRIGS/urls.py @@ -11,8 +11,7 @@ urlpatterns = patterns('', # url(r'^blog/', include('blog.urls')), url(r'^', include('RIGS.urls')), - url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail), - name="registration_register"), + url('^user/register/$', RIGS.views.ProfileRegistrationView.as_view()), url('^user/', include('django.contrib.auth.urls')), url('^user/', include('registration.backends.default.urls')), diff --git a/RIGS/forms.py b/RIGS/forms.py index 8a019409..5b4941ec 100644 --- a/RIGS/forms.py +++ b/RIGS/forms.py @@ -16,7 +16,11 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail): last_name = forms.CharField(required=False, max_length=50) initials = forms.CharField(required=True, max_length=5) 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): """ diff --git a/RIGS/views.py b/RIGS/views.py index 472f20ec..0d00680e 100644 --- a/RIGS/views.py +++ b/RIGS/views.py @@ -9,6 +9,7 @@ from django.core import serializers import simplejson from django.contrib import messages import datetime +from registration.views import RegistrationView from RIGS import models, forms @@ -33,6 +34,17 @@ def login(request, **kwargs): return login(request, authentication_form=forms.LoginForm) +class ProfileRegistrationView(RegistrationView): + form_class = forms.ProfileRegistrationFormUniqueEmail + + def register(self, request, **form): + model = models.Profile() + for (key,value) in form.items(): + setattr(model, key, value) + model.set_password(form['password1']) + model.is_active = False + return model.save() + """ 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