smile/cbmi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/0.2.9'

Browse source
This commit is contained in:
baccenfutter 2013-11-12 20:59:09 +01:00
commit 655adcbed6
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
account/forms.py
View file

@ -33,7 +33,7 @@ class GastroPinField(forms.CharField):
widget = forms.PasswordInput widget = forms.PasswordInput
def validate(self, value): def validate(self, value):
""" """
Check if the value is all numeric and 4 - 6 chars long. Check if the value is all numeric and 4 - 8 chars long.
""" """
match = re.match(r'^\d{4,8}$', value) match = re.match(r'^\d{4,8}$', value)
if not match: if not match:
@ -42,13 +42,14 @@ class GastroPinField(forms.CharField):
class GastroPinForm(forms.Form): class GastroPinForm(forms.Form):
gastropin1 = GastroPinField(label=_('New Gastro-PIN')) gastropin1 = GastroPinField(label=_('New Gastro-PIN'))
gastropin2 = GastroPinField(label=_('Repeat Gastro-PIN')) gastropin2 = GastroPinField(label=_('Repeat Gastro-PIN'),
help_text=_('Numerical only, 4 to 8 digits'))
def clean(self): def clean(self):
cleaned_data = super(GastroPinForm, self).clean() cleaned_data = super(GastroPinForm, self).clean()
gastropin1 = cleaned_data.get("gastropin1") gastropin1 = cleaned_data.get("gastropin1")
gastropin2 = cleaned_data.get("gastropin2", gastropin2 = cleaned_data.get("gastropin2")
help_text=_('Numerical only, 4 to 8 digits'))
if gastropin1 != gastropin2: if gastropin1 != gastropin2:
raise forms.ValidationError( raise forms.ValidationError(
_('The PINs entered were not identical.'), _('The PINs entered were not identical.'),