diff --git a/docs/AddUserAsset.py b/docs/AddUserAsset.py index 8ae015568..72cbed46c 100644 --- a/docs/AddUserAsset.py +++ b/docs/AddUserAsset.py @@ -108,11 +108,11 @@ def test_add_log(): if __name__ == '__main__': - # test_add_dept() - # test_add_group() - # test_add_user() - # test_add_idc() - # test_add_asset_group() + test_add_dept() + test_add_group() + test_add_user() + test_add_idc() + test_add_asset_group() test_add_asset() # test_add_log() diff --git a/jperm/models.py b/jperm/models.py index 68ab98bf7..5500a776a 100644 --- a/jperm/models.py +++ b/jperm/models.py @@ -4,8 +4,7 @@ from jasset.models import Asset, BisGroup class Perm(models.Model): - name = models.CharField(max_length=100) - user_group = models.ManyToManyField(UserGroup) + user_group = models.ForeignKey(UserGroup) asset_group = models.ManyToManyField(BisGroup) comment = models.CharField(max_length=100) diff --git a/jperm/views.py b/jperm/views.py index 873c72c1f..341e00fc3 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -42,8 +42,6 @@ def perm_add(request): if request.method == 'GET': user_groups = UserGroup.objects.filter(id__gt=2) asset_groups = BisGroup.objects.all() - users = User.objects.all() - assets = Asset.objects.all() else: name = request.POST.get('name', '') @@ -62,39 +60,51 @@ def perm_add(request): return render_to_response('jperm/perm_add.html', locals(), context_instance=RequestContext(request)) -def dept_add_asset(dept_list, asset_list): - for dept_id in dept_list: - dept = DEPT.objects.filter(id=dept_id) - if dept: - dept = dept[0] - for asset_id in asset_list: - asset = Asset.objects.filter(id=asset_id) - if asset: - asset = asset[0] - DeptPerm(dept=dept, asset=asset).save() +def dept_add_asset(dept_id, asset_list): + dept = DEPT.objects.filter(id=dept_id) + if dept: + dept = dept[0] + old_perm_asset = [perm.asset for perm in dept.deptperm_set.all()] + new_perm_asset = [] + for asset_id in asset_list: + asset = Asset.objects.filter(id=asset_id) + new_perm_asset.extend(asset) + + asset_add = [asset for asset in new_perm_asset if asset not in old_perm_asset] + asset_del = [asset for asset in old_perm_asset if asset not in new_perm_asset] + + for asset in asset_del: + DeptPerm.objects.filter(dept=dept, asset=asset).delete() + for asset in asset_add: + DeptPerm(dept=dept, asset=asset).save() def dept_perm_edit(request): header_title, path1, path2 = u'部门授权添加', u'授权管理', u'部门授权添加' - - depts = DEPT.objects.all() - assets = Asset.objects.all() - if request.method == 'POST': - dept_select = request.POST.getlist('dept_select') + if request.method == 'GET': + dept_id = request.GET.get('id', '') + dept = DEPT.objects.filter(id=dept_id) + if dept: + dept = dept[0] + asset_all = Asset.objects.all() + asset_select = [perm.asset for perm in dept.deptperm_set.all()] + assets = [asset for asset in asset_all if asset not in asset_select] + else: + dept_id = request.POST.get('dept_id') asset_select = request.POST.getlist('asset_select') - - dept_add_asset(dept_select, asset_select) - msg = '添加成功' + dept_add_asset(dept_id, asset_select) + return HttpResponseRedirect('/jperm/dept_perm_list/') return render_to_response('jperm/dept_perm_edit.html', locals(), context_instance=RequestContext(request)) def perm_list(request): - header_title, path1, path2 = u'主机授权', u'授权管理', u'授权详情' + header_title, path1, path2 = u'小组授权', u'授权管理', u'授权详情' keyword = request.GET.get('search', '') if keyword: - contact_list = Perm.objects.filter(name__icontains=keyword) + contact_list = UserGroup.objects.filter(Q(name__icontains=keyword) | Q(comment__icontains=keyword)) else: - contact_list = Perm.objects.all() + contact_list = UserGroup.objects.all().order_by('name') + contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(contact_list, request) return render_to_response('jperm/perm_list.html', locals(), context_instance=RequestContext(request)) diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index 9a418eba5..ce5c4fcd1 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -99,6 +99,15 @@ def perm_count(group_id): return group.perm_set.count() +@register.filter(name='dept_perm_count') +def dept_perm_count(dept_id): + dept = DEPT.objects.filter(id=dept_id) + if dept: + dept = dept[0] + return dept.deptperm_set.all().count() + return 0 + + @register.filter(name='group_type_to_str') def group_type_to_str(type_name): group_types = { diff --git a/templates/jperm/dept_perm_edit.html b/templates/jperm/dept_perm_edit.html index 3aa99cb4f..108e001f9 100644 --- a/templates/jperm/dept_perm_edit.html +++ b/templates/jperm/dept_perm_edit.html @@ -39,30 +39,10 @@
- -
-
- -
-
- - -
-
- - -
-
- -
-
- -
+ +
+ +
@@ -90,6 +70,9 @@
diff --git a/templates/jperm/dept_perm_list.html b/templates/jperm/dept_perm_list.html index ac6ce7311..1ee5f9ed9 100644 --- a/templates/jperm/dept_perm_list.html +++ b/templates/jperm/dept_perm_list.html @@ -48,7 +48,7 @@ 部门名称 - 成员数量 + 部门成员数量 授权主机数量 备注 操作 @@ -59,7 +59,7 @@ {{ dept.name }} {{ dept.id | dept_member }} - {{ dept.id | dept_member }} + {{ dept.id | dept_perm_count }} {{ dept.comment }} 主机 diff --git a/templates/jperm/perm_add.html b/templates/jperm/perm_add.html index 464181d92..727d45d03 100644 --- a/templates/jperm/perm_add.html +++ b/templates/jperm/perm_add.html @@ -36,43 +36,21 @@ {% if msg %}
{{ msg }}
{% endif %} - - - - - - - - -
+
+ +
+ + 取个名字方便辨识 +
+
+
- +
- {% for user_group in user_groups %} {% endfor %} @@ -90,7 +68,7 @@
-
@@ -99,23 +77,10 @@
- -
- -
-
-
- +
- {% for asset_group in asset_groups %} {% endfor %} @@ -132,7 +97,7 @@
-
@@ -198,43 +163,14 @@ $('#sudoPerm').validator({ $(document).ready(function(){ $("#submit_button").click(function(){ - $('#users_selected option').each(function(){ + $('#user_groups_select option').each(function(){ + $(this).prop('selected', true) + }) + $('#asset_groups_select option').each(function(){ $(this).prop('selected', true) }) }) }) - -function userChoice(value){ - if (value == "1"){ - $("#user_groups").children().each(function(){$(this).remove()}); - $("#user_groups_select").children().each(function(){$(this).remove()}); - $("#user_group_all").children().each(function(){ - $("#user_groups").append($(this).clone()) - }) - } - else - $("#user_groups").children().each(function(){$(this).remove()}); - $("#user_groups_select").children().each(function(){$(this).remove()}); - $("#user_all").children().each(function(){ - $("#user_groups").append($(this).clone()) - }) -} - -function assetChoice(value){ - if (value == "1"){ - $("#asset_groups").children().each(function(){$(this).remove()}); - $("#asset_groups_select").children().each(function(){$(this).remove()}); - $("#asset_group_all").children().each(function(){ - $("#asset_groups").append($(this).clone()) - }) - } - else - $("#asset_groups").children().each(function(){$(this).remove()}); - $("#asset_groups_select").children().each(function(){$(this).remove()}); - $("#asset_all").children().each(function(){ - $("#asset_groups").append($(this).clone()) - }) -} {% endblock %} \ No newline at end of file diff --git a/templates/jperm/perm_list.html b/templates/jperm/perm_list.html index a58a2bfd2..e9d18bde1 100644 --- a/templates/jperm/perm_list.html +++ b/templates/jperm/perm_list.html @@ -8,7 +8,7 @@
-
授权列表
+
查看小组
@@ -29,142 +29,57 @@
-
-
-
- +
+ 添加小组 +
+ + + + + + + + + + + + + + {% for group in contacts.object_list %} + + + + + + + + + + {% endfor %} + +
组名所属部门成员数量授权组数量授权主机数量备注操作
{{ group.name }} {{ group.dept.name }} {{ group.id | member_count }} {{ group.id | member_count }} {{ group.id | member_count }} {{ group.comment }} + 授权编辑 +{# 删除#} +
+
+
+
+ Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries +
+
+ {% include 'paginator.html' %} +
@@ -174,30 +89,20 @@ {% endblock %} \ No newline at end of file diff --git a/templates/nav.html b/templates/nav.html index a355bf3b7..86b34c995 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -36,17 +36,15 @@
  • 授权管理