Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
9d36dc9e
Commit
9d36dc9e
authored
Nov 16, 2015
by
yumaojun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. push role bug , because the password push is mandatory, so just the push key is option.
parent
d3dd9d94
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
15 deletions
+8
-15
views.py
jasset/views.py
+1
-1
views.py
jperm/views.py
+7
-4
perm_role_push.html
templates/jperm/perm_role_push.html
+0
-10
No files found.
jasset/views.py
View file @
9d36dc9e
...
@@ -160,7 +160,7 @@ def asset_add(request):
...
@@ -160,7 +160,7 @@ def asset_add(request):
asset_save
=
af_post
.
save
(
commit
=
False
)
asset_save
=
af_post
.
save
(
commit
=
False
)
if
not
use_default_auth
:
if
not
use_default_auth
:
password
=
request
.
POST
.
get
(
'password'
,
''
)
password
=
request
.
POST
.
get
(
'password'
,
''
)
password_encode
=
CRYPTOR
.
encrypt
(
password
)
password_encode
=
password
asset_save
.
password
=
password_encode
asset_save
.
password
=
password_encode
asset_save
.
is_active
=
True
if
is_active
else
False
asset_save
.
is_active
=
True
if
is_active
else
False
asset_save
.
save
()
asset_save
.
save
()
...
...
jperm/views.py
View file @
9d36dc9e
...
@@ -326,10 +326,13 @@ def perm_role_push(request):
...
@@ -326,10 +326,13 @@ def perm_role_push(request):
task
=
Tasks
(
push_resource
)
task
=
Tasks
(
push_resource
)
ret
=
{}
ret
=
{}
ret_failed
=
[]
ret_failed
=
[]
if
password_push
:
ret
[
"password_push"
]
=
task
.
add_multi_user
(
**
role_pass
)
# 因为要先建立用户,所以password 是必选项,
if
ret
[
"password_push"
]
.
get
(
"status"
)
!=
"success"
:
# 而push key是在 password也完成的情况下的 可选项
ret_failed
.
append
(
1
)
ret
[
"password_push"
]
=
task
.
add_multi_user
(
**
role_pass
)
if
ret
[
"password_push"
]
.
get
(
"status"
)
!=
"success"
:
ret_failed
.
append
(
1
)
if
key_push
:
if
key_push
:
ret
[
"key_push"
]
=
task
.
push_multi_key
(
**
role_key
)
ret
[
"key_push"
]
=
task
.
push_multi_key
(
**
role_key
)
if
ret
[
"key_push"
]
.
get
(
"status"
)
!=
"success"
:
if
ret
[
"key_push"
]
.
get
(
"status"
)
!=
"success"
:
...
...
templates/jperm/perm_role_push.html
View file @
9d36dc9e
...
@@ -67,16 +67,6 @@
...
@@ -67,16 +67,6 @@
</div>
</div>
<div
class=
"hr-line-dashed"
></div>
<div
class=
"hr-line-dashed"
></div>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"form-group"
>
<label
for=
"j_group"
class=
"col-sm-2 control-label"
>
使用密码
</label>
<div
class=
"col-sm-1"
>
<div
class=
"radio i-checks"
>
<label>
<input
type=
"checkbox"
value=
"1"
id=
"use_password"
name=
"use_password"
>
</label>
</div>
</div>
</div>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
for=
"j_group"
class=
"col-sm-2 control-label"
>
使用秘钥
</label>
<label
for=
"j_group"
class=
"col-sm-2 control-label"
>
使用秘钥
</label>
<div
class=
"col-sm-1"
>
<div
class=
"col-sm-1"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment