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
974619d1
Commit
974619d1
authored
Dec 11, 2015
by
yumaojun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed rule and role detail page not id bug
parent
aa262d04
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
views.py
jperm/views.py
+11
-1
No files found.
jperm/views.py
View file @
974619d1
...
...
@@ -53,7 +53,11 @@ def perm_rule_detail(request):
header_title
,
path1
,
path2
=
"授权规则"
,
"规则管理"
,
"规则详情"
# 根据rule_id 取得rule对象
try
:
if
request
.
method
==
"GET"
:
rule_id
=
request
.
GET
.
get
(
"id"
)
if
not
rule_id
:
raise
ServerError
(
"Rule Detail - no rule id get"
)
rule_obj
=
PermRule
.
objects
.
get
(
id
=
rule_id
)
user_obj
=
rule_obj
.
user
.
all
()
user_group_obj
=
rule_obj
.
user_group
.
all
()
...
...
@@ -68,6 +72,8 @@ def perm_rule_detail(request):
user_groups
=
user_group_obj
assets
=
asset_obj
asset_groups
=
asset_group_obj
except
ServerError
,
e
:
logger
.
warning
(
e
)
return
my_render
(
'jperm/perm_rule_detail.html'
,
locals
(),
request
)
...
...
@@ -335,7 +341,6 @@ def perm_role_delete(request):
return
HttpResponse
(
u"不支持该操作"
)
@require_role
(
'admin'
)
def
perm_role_detail
(
request
):
"""
...
...
@@ -350,8 +355,11 @@ def perm_role_detail(request):
# 渲染数据
header_title
,
path1
,
path2
=
"系统角色"
,
"角色管理"
,
"角色详情"
try
:
if
request
.
method
==
"GET"
:
role_id
=
request
.
GET
.
get
(
"id"
)
if
not
role_id
:
raise
ServerError
(
"not role id"
)
role
=
get_object
(
PermRole
,
id
=
role_id
)
role_info
=
get_role_info
(
role_id
)
...
...
@@ -362,6 +370,8 @@ def perm_role_detail(request):
users
=
role_info
.
get
(
"users"
)
user_groups
=
role_info
.
get
(
"user_groups"
)
pushed_asset
,
need_push_asset
=
get_role_push_host
(
get_object
(
PermRole
,
id
=
role_id
))
except
ServerError
,
e
:
logger
.
warning
(
e
)
return
my_render
(
'jperm/perm_role_detail.html'
,
locals
(),
request
)
...
...
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