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

Remove password fields if needed.

Browse Source 
fixes #440
This commit is contained in:
Antoine Nguyen
2013-07-09 22:19:28 +02:00
parent 941b7e94dd
commit 222143a0d6
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/forms.py
+7 -1
View File
@@ -411,6 +411,11 @@ class AccountFormGeneral(forms.ModelForm):
u = kwargs["instance"]
self.fields["role"].initial = u.group
if not u.is_local \
and parameters.get_admin("LDAP_AUTH_METHOD") == "directbind":
del self.fields["password1"]
del self.fields["password2"]
def clean_role(self):
if self.user.group == "DomainAdmins":
if self.instance == self.user:
@@ -440,7 +445,8 @@ class AccountFormGeneral(forms.ModelForm):
if self.user == account and not self.cleaned_data["is_active"]:
raise AdminError(_("You can't disable your own account"))
if commit:
if self.cleaned_data["password1"] != "":
if "password1" in self.cleaned_data \
and self.cleaned_data["password1"] != "":
account.set_password(self.cleaned_data["password1"])
account.save()
account.set_role(self.cleaned_data["role"])