Skip to content

J
jumpserver
Commit c1686d52 authored by guanghongwei's avatar guanghongwei
Browse files
Options

授权编辑和查看修改完毕

parent c09d1d25
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 7 deletions
jperm/urls.py
View file @ c1686d52
...@@ -10,4 +10,5 @@ urlpatterns = patterns('jperm.views', ...@@ -10,4 +10,5 @@ urlpatterns = patterns('jperm.views',
(r'^perm_list/$', 'perm_list'), (r'^perm_list/$', 'perm_list'),
(r'^perm_detail/$', 'perm_detail'), (r'^perm_detail/$', 'perm_detail'),
(r'^perm_del/$', 'perm_del'), (r'^perm_del/$', 'perm_del'),
(r'^perm_asset_detail/$', 'perm_asset_detail'),
) )
jperm/views.py
View file @ c1686d52
...@@ -25,6 +25,23 @@ def perm_group_update(user_group_name='', user_group_id='', asset_groups_name='' ...@@ -25,6 +25,23 @@ def perm_group_update(user_group_name='', user_group_id='', asset_groups_name=''
Perm(user_group=user_group, asset_group=asset_group).save() Perm(user_group=user_group, asset_group=asset_group).save()
def perm_user_asset(user_id):
user = User.objects.get(id=user_id)
user_groups = user.user_group.all()
perms = []
assets = []
for user_group in user_groups:
perm = user_group.perm_set.all()
perms.extend(perm)
asset_groups = [perm.asset_group for perm in perms]
for asset_group in asset_groups:
assets.extend(list(asset_group.asset_set.all()))
return list(set(assets))
def perm_list(request): def perm_list(request):
header_title, path1, path2 = u'主机授权 | Perm Host Detail.', u'jperm', u'perm_list' header_title, path1, path2 = u'主机授权 | Perm Host Detail.', u'jperm', u'perm_list'
groups = contact_list = UserGroup.objects.all().order_by('type') groups = contact_list = UserGroup.objects.all().order_by('type')
...@@ -75,6 +92,12 @@ def perm_del(request): ...@@ -75,6 +92,12 @@ def perm_del(request):
return HttpResponseRedirect('/jperm/perm_list/') return HttpResponseRedirect('/jperm/perm_list/')
def perm_asset_detail(request):
user_id = request.GET.get('id')
user = User.objects.get(id=user_id)
assets = perm_user_asset(user_id)
return render_to_response('jperm/perm_asset_detail.html', locals())
# def perm_user_host(username, ips): # def perm_user_host(username, ips):
# user = User.objects.get(username=username) # user = User.objects.get(username=username)
......
jumpserver/templatetags/mytags.py
View file @ c1686d52
...@@ -4,6 +4,7 @@ import time ...@@ -4,6 +4,7 @@ import time
from django import template from django import template
from django.db.models import Q from django.db.models import Q
from juser.models import User, UserGroup from juser.models import User, UserGroup
from jperm.views import perm_user_asset
register = template.Library() register = template.Library()
...@@ -73,3 +74,7 @@ def group_type_to_str(type_name): ...@@ -73,3 +74,7 @@ def group_type_to_str(type_name):
'A': '授权组', 'A': '授权组',
} }
return group_types.get(type_name) return group_types.get(type_name)
@register.filter(name='perm_asset_count')
def perm_asset_count(user_id):
return len(perm_user_asset(user_id))
templates/jperm/perm_asset_detail.html 0 → 100644
View file @ c1686d52
{% load mytags %}
<html>
<head>
{% include 'link_css.html' %}
<style type="text/css">
body
{
background: #FFFFFF;
}
</style>
</head>
<body>
<div class="row">
<div class="contact-box">
<h2 class="text-center">{{ user.name }} 授权详情</h2>
<div class="ibox-content">
<table class="table table-striped table-bordered table-hover " id="editable" >
<thead>
<tr>
<th class="text-center">主机</th>
<th class="text-center">端口</th>
<th class="text-center">登录方式</th>
</tr>
</thead>
<tbody>
{% for asset in assets %}
<tr class="gradeX">
<td class="text-center">{{ asset.ip }}</td>
<td class="text-center">{{ asset.port }}</td>
<td class="text-center">{{ asset.login_type }}</td>
</tr>
{% endfor %}
</table>
</div>
</div>
</body>
</html>
\ No newline at end of file
templates/jperm/perm_list.html
View file @ c1686d52
...@@ -113,19 +113,22 @@ ...@@ -113,19 +113,22 @@
<table class="table table-striped table-bordered table-hover " id="editable" > <table class="table table-striped table-bordered table-hover " id="editable" >
<thead> <thead>
<tr> <tr>
<th class="text-center">组名</th> <th class="text-center">用户</th>
<th class="text-center">备注</th> <th class="text-center">角色</th>
<th class="text-center">属组</th>
<th class="text-center">主机数量</th>
<th class="text-center">操作</th> <th class="text-center">操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for group in contacts2.object_list %} {% for user in contacts2.object_list %}
<tr class="gradeX"> <tr class="gradeX">
<td class="text-center"> {{ group.name }} </td> <td class="text-center"> {{ user.name }} </td>
<td class="text-center"> {{ group.comment }} </td> <td class="text-center"> {{ user.id | get_role }} </td>
<td class="text-center"> {{ user.username | groups_str }} </td>
<td class="text-center"> {{ user.id | perm_asset_count }} </td>
<td class="text-center"> <td class="text-center">
<a href="../perm_group_detail/?id={{ user.id }}" class="iframe btn btn-xs btn-primary">详情</a> <a href="../perm_asset_detail/?id={{ user.id }}" class="iframe btn btn-xs btn-primary">详情</a>
<a href="../perm_group_edit/?id={{ user.id }}" class="btn btn-xs btn-info">编辑</a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
......
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