github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't check password if empty.

Browse Source 
see #1153
This commit is contained in:
Antoine Nguyen
2017-06-22 15:53:58 +02:00
parent 109329ae05
commit ba2014e4f0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/forms/account.py
+4 -4
View File
@@ -157,7 +157,8 @@ class AccountFormGeneral(forms.ModelForm):
if password1 != password2:
raise forms.ValidationError(
_("The two password fields didn't match."))
password_validation.validate_password(password2, self.instance)
if password2 != "":
password_validation.validate_password(password2, self.instance)
return password2
def clean(self):
@@ -182,9 +183,8 @@ class AccountFormGeneral(forms.ModelForm):
raise lib_exceptions.PermDeniedException(
_("You can't disable your own account"))
if commit:
if "password1" in self.cleaned_data \
and self.cleaned_data["password1"] != "":
account.set_password(self.cleaned_data["password1"])
if self.cleaned_data.get("password2", "") != "":
account.set_password(self.cleaned_data["password2"])
account.save()
account.role = self.cleaned_data["role"]
return account