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

fixed rule and role detail page not id bug

pull/26/head
yumaojun 2015-12-11 14:38:10 +08:00
parent aa262d0430
commit 974619d1ce
1 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
jperm/views.py
View File

@ -53,21 +53,27 @@ def perm_rule_detail(request):
header_title, path1, path2 = "授权规则", "规则管理", "规则详情" header_title, path1, path2 = "授权规则", "规则管理", "规则详情"
# 根据rule_id 取得rule对象 # 根据rule_id 取得rule对象
rule_id = request.GET.get("id") try:
rule_obj = PermRule.objects.get(id=rule_id) if request.method == "GET":
user_obj = rule_obj.user.all() rule_id = request.GET.get("id")
user_group_obj = rule_obj.user_group.all() if not rule_id:
asset_obj = rule_obj.asset.all() raise ServerError("Rule Detail - no rule id get")
asset_group_obj = rule_obj.asset_group.all() rule_obj = PermRule.objects.get(id=rule_id)
roles_name = [role.name for role in rule_obj.role.all()] user_obj = rule_obj.user.all()
user_group_obj = rule_obj.user_group.all()
asset_obj = rule_obj.asset.all()
asset_group_obj = rule_obj.asset_group.all()
roles_name = [role.name for role in rule_obj.role.all()]
# 渲染数据 # 渲染数据
roles_name = ','.join(roles_name) roles_name = ','.join(roles_name)
rule = rule_obj rule = rule_obj
users = user_obj users = user_obj
user_groups = user_group_obj user_groups = user_group_obj
assets = asset_obj assets = asset_obj
asset_groups = asset_group_obj asset_groups = asset_group_obj
except ServerError, e:
logger.warning(e)
return my_render('jperm/perm_rule_detail.html', locals(), request) return my_render('jperm/perm_rule_detail.html', locals(), request)
@ -335,7 +341,6 @@ def perm_role_delete(request):
return HttpResponse(u"不支持该操作") return HttpResponse(u"不支持该操作")
@require_role('admin') @require_role('admin')
def perm_role_detail(request): def perm_role_detail(request):
""" """
@ -350,20 +355,25 @@ def perm_role_detail(request):
# 渲染数据 # 渲染数据
header_title, path1, path2 = "系统角色", "角色管理", "角色详情" header_title, path1, path2 = "系统角色", "角色管理", "角色详情"
if request.method == "GET": try:
role_id = request.GET.get("id") if request.method == "GET":
role = get_object(PermRole, id=role_id) role_id = request.GET.get("id")
role_info = get_role_info(role_id) if not role_id:
raise ServerError("not role id")
role = get_object(PermRole, id=role_id)
role_info = get_role_info(role_id)
# 渲染数据 # 渲染数据
rules = role_info.get("rules") rules = role_info.get("rules")
assets = role_info.get("assets") assets = role_info.get("assets")
asset_groups = role_info.get("asset_groups") asset_groups = role_info.get("asset_groups")
users = role_info.get("users") users = role_info.get("users")
user_groups = role_info.get("user_groups") user_groups = role_info.get("user_groups")
pushed_asset, need_push_asset = get_role_push_host(get_object(PermRole, id=role_id)) 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) return my_render('jperm/perm_role_detail.html', locals(), request)
@require_role('admin') @require_role('admin')