github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Bugfix] 修复系统用户上传秘钥的bug

pull/1007/head
ibuler 2018-01-30 11:56:41 +08:00
parent bad397e2e6
commit 1192e8cdad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/assets/forms.py
View File

@ -284,11 +284,11 @@ class AdminUserForm(forms.ModelForm):
class SystemUserForm(forms.ModelForm): class SystemUserForm(forms.ModelForm):
# Admin user assets define, let user select, save it in form not in view # Admin user assets define, let user select, save it in form not in view
auto_generate_key = forms.BooleanField(initial=True, required=False) auto_generate_key = forms.BooleanField(initial=True, required=False)
# Need use upload private key file except paste private key content
private_key_file = forms.FileField(required=False, label=_("Private key"))
# Form field name can not start with `_`, so redefine it, # Form field name can not start with `_`, so redefine it,
password = forms.CharField(widget=forms.PasswordInput, required=False, password = forms.CharField(widget=forms.PasswordInput, required=False,
max_length=128, strip=True, label=_("Password")) max_length=128, strip=True, label=_("Password"))
# Need use upload private key file except paste private key content
private_key_file = forms.FileField(required=False, label=_("Private key"))
def save(self, commit=True): def save(self, commit=True):
# Because we define custom field, so we need rewrite :method: `save` # Because we define custom field, so we need rewrite :method: `save`
@ -328,7 +328,7 @@ class SystemUserForm(forms.ModelForm):
model = SystemUser model = SystemUser
fields = [ fields = [
'name', 'username', 'protocol', 'auto_generate_key', 'name', 'username', 'protocol', 'auto_generate_key',
'password', 'private_key_file', 'auto_push', 'sudo', 'private_key_file', 'password', 'auto_push', 'sudo',
'comment', 'shell', 'cluster', 'priority', 'comment', 'shell', 'cluster', 'priority',
] ]
widgets = { widgets = {