mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-23 16:32:15 +00:00
Bugfix for #27
This commit is contained in:
@@ -2,7 +2,6 @@ from django.conf.urls import patterns, include, url
|
|||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from registration.forms import RegistrationFormUniqueEmail
|
|
||||||
from registration.backends.default.views import RegistrationView
|
from registration.backends.default.views import RegistrationView
|
||||||
import RIGS
|
import RIGS
|
||||||
|
|
||||||
@@ -12,7 +11,8 @@ urlpatterns = patterns('',
|
|||||||
# url(r'^blog/', include('blog.urls')),
|
# url(r'^blog/', include('blog.urls')),
|
||||||
|
|
||||||
url(r'^', include('RIGS.urls')),
|
url(r'^', include('RIGS.urls')),
|
||||||
url('^user/register/', RegistrationView.as_view(form_class=RegistrationFormUniqueEmail), name="registration_register"),
|
url('^user/register/$', RegistrationView.as_view(form_class=RIGS.forms.ProfileRegistrationFormUniqueEmail),
|
||||||
|
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')),
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,15 @@ from django import forms
|
|||||||
from django.utils import formats
|
from django.utils import formats
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.core import serializers
|
from django.core import serializers
|
||||||
|
from registration.forms import RegistrationFormUniqueEmail
|
||||||
import simplejson
|
import simplejson
|
||||||
|
|
||||||
from RIGS import models
|
from RIGS import models
|
||||||
|
|
||||||
|
#Registration
|
||||||
|
class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
|
||||||
|
initials = forms.CharField(required=True, max_length=5)
|
||||||
|
phone = forms.CharField(required=False, max_length=13)
|
||||||
|
|
||||||
# Events Shit
|
# Events Shit
|
||||||
class EventForm(forms.ModelForm):
|
class EventForm(forms.ModelForm):
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ from decimal import Decimal
|
|||||||
|
|
||||||
# Create your models here.
|
# Create your models here.
|
||||||
class Profile(AbstractUser):
|
class Profile(AbstractUser):
|
||||||
initials = models.CharField(max_length=5, unique=True, null=True, blank=True)
|
initials = models.CharField(max_length=5, unique=True, null=True, blank=False)
|
||||||
phone = models.CharField(max_length=13, null=True, blank=True)
|
phone = models.CharField(max_length=13, null=True, blank=True)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
Reference in New Issue
Block a user