Skip to content

J
jumpserver
Commit d5fba23d authored by ibuler's avatar ibuler
Browse files
Options

添加授权详情页，并添加用户详情页链接到授权列表

parent e96053ba
Expand all Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 64 deletions
jperm/views.py
View file @ d5fba23d
This diff is collapsed.
jumpserver/api.py
View file @ d5fba23d
...@@ -283,6 +283,14 @@ def view_splitter(request, su=None, adm=None): ...@@ -283,6 +283,14 @@ def view_splitter(request, su=None, adm=None):
return HttpResponseRedirect('/login/') return HttpResponseRedirect('/login/')
def user_group_perm_asset_group_api(user_group):
asset_group_list = []
perm_list = user_group.perm_set.all()
for perm in perm_list:
asset_group_list.append(perm.asset_group)
return asset_group_list
def user_perm_group_api(username): def user_perm_group_api(username):
if username: if username:
user = User.objects.get(username=username) user = User.objects.get(username=username)
......
jumpserver/templatetags/mytags.py
View file @ d5fba23d
...@@ -380,3 +380,6 @@ def sudo_cmd_ids(user_group_id): ...@@ -380,3 +380,6 @@ def sudo_cmd_ids(user_group_id):
return '0' return '0'
@register.filter(name='cmd_group_split')
def cmd_group_split(cmd_group):
return cmd_group.cmd.split(',')
templates/jperm/perm_detail.html
View file @ d5fba23d
...@@ -5,10 +5,10 @@ ...@@ -5,10 +5,10 @@
{% include 'nav_cat_bar.html' %} {% include 'nav_cat_bar.html' %}
<div class="wrapper wrapper-content animated fadeInRight"> <div class="wrapper wrapper-content animated fadeInRight">
<div class="row"> <div class="row">
<div class="col-lg-6"> <div class="col-lg-4">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
<h5>用户详情</h5> <h5>授权主机/组</h5>
<div class="ibox-tools"> <div class="ibox-tools">
<a class="collapse-link"> <a class="collapse-link">
<i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-up"></i>
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
<i class="fa fa-wrench"></i> <i class="fa fa-wrench"></i>
</a> </a>
<ul class="dropdown-menu dropdown-user"> <ul class="dropdown-menu dropdown-user">
<li><a href="#">未启用 1</a> <li><a href="#">Config option 1</a>
</li> </li>
<li><a href="#">未启用 2</a> <li><a href="#">Config option 2</a>
</li> </li>
</ul> </ul>
<a class="close-link"> <a class="close-link">
...@@ -27,35 +27,41 @@ ...@@ -27,35 +27,41 @@
</a> </a>
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content ibox-heading">
<table class="table"> <h3>用户</h3>
<thead> <small><i class="fa fa-map-marker"></i> 组下用户.</small>
<tr> </div>
<th>用户名</th> <div class="ibox-content inspinia-timeline">
<th>姓名</th> <div class="timeline-item">
<th>部门</th> <div class="row">
<th>小组</th> <div class="col-xs-3 date">
</tr> <i class="fa fa-users"></i>
</thead> <b>{{ user_group.name }}</b>
<tbody> <br>
{% for user in users_list %} <small class="text-navy">共: {{ group_user_num }} 用户</small>
<tr> </div>
<td>{{ user.username }}</td> <div class="col-xs-7 content no-top-border">
<td>{{ user.name }}</td> <p class="m-b-xs"><strong>{{ user_group.comment }}</strong></p>
<td>{{ user.dept.name }}</td> <p>
<td>{{ user.group.all | group_str2 }}</td> {% for user in users %}
</tr> {{ user.name }}<br>
{% endfor %} {% endfor %}
</tbody> </p>
</table> <p></p>
</div>
</div>
</div>
{% if not user|get_user_asset_group %}
(无)
{% endif %}
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-4">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
<h5>授权详情</h5> <h5>授权主机/组</h5>
<div class="ibox-tools"> <div class="ibox-tools">
<a class="collapse-link"> <a class="collapse-link">
<i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-up"></i>
...@@ -64,9 +70,9 @@ ...@@ -64,9 +70,9 @@
<i class="fa fa-wrench"></i> <i class="fa fa-wrench"></i>
</a> </a>
<ul class="dropdown-menu dropdown-user"> <ul class="dropdown-menu dropdown-user">
<li><a href="#">未启用 1</a> <li><a href="#">Config option 1</a>
</li> </li>
<li><a href="#">未启用 2</a> <li><a href="#">Config option 2</a>
</li> </li>
</ul> </ul>
<a class="close-link"> <a class="close-link">
...@@ -74,33 +80,38 @@ ...@@ -74,33 +80,38 @@
</a> </a>
</div> </div>
</div> </div>
<div class="ibox-content"> <div class="ibox-content ibox-heading">
<table class="table"> <h3>授权主机/组</h3>
<thead> <small><i class="fa fa-map-marker"></i> 这里包含了用户所有的主机组和组下的主机.</small>
<tr> </div>
<th>IP</th> <div class="ibox-content inspinia-timeline">
<th>IDC</th> {% for group in asset_groups %}
<th>主机组</th> <div class="timeline-item">
</tr> <div class="row">
</thead> <div class="col-xs-3 date">
<tbody> <i class="fa fa-repeat"></i>
{% for asset in assets_list %} <b>{{ group.name }}</b>
<tr> <br>
<td>{{ asset.ip }}</td> <small class="text-navy">共: {{ group | group_asset_list_count }}台</small>
<td>{{ asset.idc.name }}</td> </div>
<td> <div class="col-xs-7 content no-top-border">
{% for group in asset.bis_group.all %} <p class="m-b-xs"><strong>{{ group.comment }}</strong></p>
{{ group }} <p>
{% for asset in group|group_asset_list %}
{{ asset.ip }}<br>
{% endfor %} {% endfor %}
</td> </p>
</tr> <p></p>
</div>
</div>
</div>
{% endfor %} {% endfor %}
</tbody> {% if not user|get_user_asset_group %}
</table> (暂无)
{% endif %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
......
templates/jperm/sudo_detail.html
View file @ d5fba23d
This diff is collapsed.
templates/jperm/sudo_list.html
View file @ d5fba23d
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="wrapper wrapper-content animated fadeInRight"> <div class="wrapper wrapper-content animated fadeInRight">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-10">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
<h5> Sudo授权列表 </h5> <h5> Sudo授权列表 </h5>
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="tab-content"> <div class="tab-content">
<div id="tab-1" class="tab-pane active"> <div id="tab-1" class="tab-pane active">
<table class="table table-striped table-bordered table-hover " id="editable" > <table class="table table-striped table-bordered table-hover " id="editable" >
...@@ -72,6 +71,7 @@ ...@@ -72,6 +71,7 @@
<td class="text-center"><a value="/jperm/cmd_detail/?id={{ group.id | sudo_cmd_ids }}" class="iframe">{{ group.id | sudo_cmd_count }}</a> </td> <td class="text-center"><a value="/jperm/cmd_detail/?id={{ group.id | sudo_cmd_ids }}" class="iframe">{{ group.id | sudo_cmd_count }}</a> </td>
<td class="text-center"> {{ group.comment }} </td> <td class="text-center"> {{ group.comment }} </td>
<td class="text-center"> <td class="text-center">
<a href="../sudo_detail/?id={{ group.id }}" class="btn btn-xs btn-primary">详情</a>
<a href="../sudo_edit/?id={{ group.id }}" class="btn btn-xs btn-danger">sudo授权</a> <a href="../sudo_edit/?id={{ group.id }}" class="btn btn-xs btn-danger">sudo授权</a>
</td> </td>
</tr> </tr>
...@@ -87,15 +87,9 @@ ...@@ -87,15 +87,9 @@
{% include 'paginator.html' %} {% include 'paginator.html' %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
......
templates/juser/user_detail.html
View file @ d5fba23d
...@@ -118,20 +118,18 @@ ...@@ -118,20 +118,18 @@
<div class="row"> <div class="row">
<div class="col-xs-3 date"> <div class="col-xs-3 date">
<i class="fa fa-repeat"></i> <i class="fa fa-repeat"></i>
<b>{{ group.name }}</b> <b><a href="/jperm/perm_list/?uid={{ user.id }}&agid={{ group.id }}">{{ group.name }}</a></b>
<br> <br>
<small class="text-navy">共: {{ group | group_asset_list_count }}台</small> <small class="text-navy">共: {{ group | group_asset_list_count }}台</small>
</div> </div>
<div class="col-xs-7 content no-top-border"> <div class="col-xs-7 content no-top-border">
<p class="m-b-xs"><strong>{{ group.comment }}</strong></p> <p class="m-b-xs"><strong>{{ group.comment }}</strong></p>
<p> <p>
{% for asset in group|group_asset_list %} {% for asset in group|group_asset_list %}
{{ asset.ip }}<br> {{ asset.ip }}<br>
{% endfor %} {% endfor %}
</p> </p>
<p></p> <p></p>
</div> </div>
</div> </div>
</div> </div>
......
templates/nav.html
View file @ d5fba23d
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
<a href="/jperm/dept_perm_list/">部门授权</a> <a href="/jperm/dept_perm_list/">部门授权</a>
</li> </li>
<li class="perm_list perm_edit perm_detail "> <li class="perm_list perm_edit perm_detail">
<a href="/jperm/perm_list/">小组授权</a> <a href="/jperm/perm_list/">小组授权</a>
</li> </li>
<li class="sudo_list sudo_edit sudo_add cmd_list cmd_edit cmd_add"> <li class="sudo_list sudo_edit sudo_add cmd_list cmd_edit cmd_add sudo_detail">
<a href="/jperm/sudo_list/">Sudo授权</a> <a href="/jperm/sudo_list/">Sudo授权</a>
</li> </li>
<li class="apply_show online"><a href="/jperm/apply_show/online/">权限审批</a></li> <li class="apply_show online"><a href="/jperm/apply_show/online/">权限审批</a></li>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<a href="/jperm/perm_list/">小组授权</a> <a href="/jperm/perm_list/">小组授权</a>
</li> </li>
<li class="sudo_list sudo_edit sudo_add cmd_list cmd_edit cmd_add"> <li class="sudo_list sudo_edit sudo_add cmd_list cmd_edit cmd_add sudo_detail">
<a href="/jperm/sudo_list/">Sudo授权</a> <a href="/jperm/sudo_list/">Sudo授权</a>
</li> </li>
<li class="apply_show online"><a href="/jperm/apply_show/online/">权限审批</a></li> <li class="apply_show online"><a href="/jperm/apply_show/online/">权限审批</a></li>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment