Merge branch 'master' into duplicate-event

This commit is contained in:
David Taylor
2015-08-27 23:59:50 +01:00
9 changed files with 57 additions and 28 deletions

View File

@@ -12,16 +12,11 @@ from RIGS import models
#Registration
class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
username = forms.CharField(required=True, max_length=30)
first_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)
phone = forms.CharField(required=False, max_length=13)
captcha = ReCaptchaField()
class Meta:
model = models.Profile
fields = ('username','first_name','last_name','initials','phone')
fields = ('username','email','first_name','last_name','initials','phone')
def clean_initials(self):
"""