github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-26 23:07:24 +00:00
Code Issues Projects Releases Wiki Activity

[Bugfix] 修改添加用户的bug

Browse Source
This commit is contained in:
ibuler 2018-03-27 17:47:53 +08:00
parent a39424ac09
commit f85e5b6f75
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/users/forms.py
View File

@ -27,7 +27,7 @@ class UserCreateUpdateForm(forms.ModelForm):
) )
role = forms.ChoiceField(choices=role_choices, required=True, initial=User.ROLE_USER, label=_("Role")) role = forms.ChoiceField(choices=role_choices, required=True, initial=User.ROLE_USER, label=_("Role"))
public_key = forms.CharField( public_key = forms.CharField(
label=_('ssh public key'), max_length=5000, label=_('ssh public key'), max_length=5000, required=False,
widget=forms.Textarea(attrs={'placeholder': _('ssh-rsa AAAA...')}), widget=forms.Textarea(attrs={'placeholder': _('ssh-rsa AAAA...')}),
help_text=_('Paste user id_rsa.pub here.') help_text=_('Paste user id_rsa.pub here.')
) )
@ -54,6 +54,8 @@ class UserCreateUpdateForm(forms.ModelForm):
def clean_public_key(self): def clean_public_key(self):
public_key = self.cleaned_data['public_key'] public_key = self.cleaned_data['public_key']
if not public_key:
return public_key
if self.instance.public_key and public_key == self.instance.public_key: if self.instance.public_key and public_key == self.instance.public_key:
msg = _('Public key should not be the same as your old one.') msg = _('Public key should not be the same as your old one.')
raise forms.ValidationError(msg) raise forms.ValidationError(msg)