Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
3aaea6cc
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3aaea6cc
编写于
3月 27, 2018
作者:
baltery
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'bugfix_useradd' into dev
上级
d598571d
f85e5b6f
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
3 addition
and
1 deletion
+3
-1
apps/users/forms.py
apps/users/forms.py
+3
-1
未找到文件。
apps/users/forms.py
浏览文件 @
3aaea6cc
...
@@ -27,7 +27,7 @@ class UserCreateUpdateForm(forms.ModelForm):
...
@@ -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):
...
@@ -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
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录