mirror of https://github.com/jumpserver/jumpserver
[Bugfix] 修复重置密码bug
parent
b4080be5be
commit
7e23d2c234
|
@ -29,7 +29,7 @@ class UserCreateUpdateForm(forms.ModelForm):
|
||||||
model = User
|
model = User
|
||||||
fields = [
|
fields = [
|
||||||
'username', 'name', 'email', 'groups', 'wechat',
|
'username', 'name', 'email', 'groups', 'wechat',
|
||||||
'phone', 'role', 'date_expired', 'comment', 'password'
|
'phone', 'role', 'date_expired', 'comment',
|
||||||
]
|
]
|
||||||
help_texts = {
|
help_texts = {
|
||||||
'username': '* required',
|
'username': '* required',
|
||||||
|
@ -38,13 +38,16 @@ class UserCreateUpdateForm(forms.ModelForm):
|
||||||
}
|
}
|
||||||
widgets = {
|
widgets = {
|
||||||
'groups': forms.SelectMultiple(
|
'groups': forms.SelectMultiple(
|
||||||
attrs={'class': 'select2',
|
attrs={
|
||||||
'data-placeholder': _('Join user groups')}),
|
'class': 'select2',
|
||||||
|
'data-placeholder': _('Join user groups')
|
||||||
|
}
|
||||||
|
),
|
||||||
}
|
}
|
||||||
|
|
||||||
def save(self, commit=True):
|
def save(self, commit=True):
|
||||||
|
password = self.cleaned_data.pop('password')
|
||||||
user = super().save(commit=commit)
|
user = super().save(commit=commit)
|
||||||
password = self.cleaned_data.get('password')
|
|
||||||
if password:
|
if password:
|
||||||
user.set_password(password)
|
user.set_password(password)
|
||||||
user.save()
|
user.save()
|
||||||
|
|
Loading…
Reference in New Issue