pedro
/
django-orchestra-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for password migration

This commit is contained in:
Marc 2014-10-24 10:28:53 +00:00
parent 786b9a7657
commit 5ca9215303
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
orchestra/forms/options.py
View File

@ -47,11 +47,16 @@ class UserCreationForm(forms.ModelForm):
widget=forms.PasswordInput, widget=forms.PasswordInput,
help_text=_("Enter the same password as above, for verification.")) help_text=_("Enter the same password as above, for verification."))
# def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
# super(UserCreationForm, self).__init__(*args, **kwargs) super(UserCreationForm, self).__init__(*args, **kwargs)
# self.fields['password1'].validators.append(validate_password) if settings.ORCHESTRA_MIGRATION_MODE:
self.fields['password1'].widget = forms.TextInput(attrs={'size':'130'})
self.fields['password2'].widget = forms.HiddenInput()
self.fields['password2'].required = False
def clean_password2(self): def clean_password2(self):
if settings.ORCHESTRA_MIGRATION_MODE:
return self.cleaned_data.get('password1')
password1 = self.cleaned_data.get('password1') password1 = self.cleaned_data.get('password1')
password2 = self.cleaned_data.get('password2') password2 = self.cleaned_data.get('password2')
if password1 and password2 and password1 != password2: if password1 and password2 and password1 != password2:
@ -73,7 +78,7 @@ class UserCreationForm(forms.ModelForm):
def save(self, commit=True): def save(self, commit=True):
user = super(UserCreationForm, self).save(commit=False) user = super(UserCreationForm, self).save(commit=False)
if settings.ORCHESTRA_MIGRATION_MODE: if not settings.ORCHESTRA_MIGRATION_MODE:
user.password = self.cleaned_data['password1'] user.password = self.cleaned_data['password1']
else: else:
user.set_password(self.cleaned_data['password1']) user.set_password(self.cleaned_data['password1'])