From 475501595ef6517e50b9ad6ee7ad0ab43096b917 Mon Sep 17 00:00:00 2001 From: guanghongwei Date: Thu, 12 Mar 2015 18:43:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E9=A1=B5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jperm/models.py | 3 +- jperm/views.py | 51 ++++++++++++--------------- jumpserver/templatetags/mytags.py | 21 +++++++++++ juser/urls.py | 2 +- juser/views.py | 25 ++++++++++--- templates/jperm/dept_perm_list.html | 6 ++-- templates/jperm/perm_edit.html | 54 ++++------------------------- templates/jperm/perm_list.html | 15 ++++---- templates/juser/dept_list.html | 4 +-- templates/juser/group_list.html | 4 +-- templates/nav.html | 3 -- 11 files changed, 87 insertions(+), 101 deletions(-) diff --git a/jperm/models.py b/jperm/models.py index 5500a776a..84cd6716e 100644 --- a/jperm/models.py +++ b/jperm/models.py @@ -5,8 +5,7 @@ from jasset.models import Asset, BisGroup class Perm(models.Model): user_group = models.ForeignKey(UserGroup) - asset_group = models.ManyToManyField(BisGroup) - comment = models.CharField(max_length=100) + asset_group = models.ForeignKey(BisGroup) def __unicode__(self): return '%s_%s' % (self.user_group.name, self.asset_group.name) diff --git a/jperm/views.py b/jperm/views.py index 341e00fc3..38cae2ee1 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -122,47 +122,40 @@ def dept_perm_list(request): return render_to_response('jperm/dept_perm_list.html', locals(), context_instance=RequestContext(request)) -def perm_group_update(perm_id, user_group_id_list, asset_groups_id_list): - perm = Perm.objects.filter(id=perm_id) - if perm: - perm = perm[0] - user_group_list = [] - asset_group_list = [] - - for user_group_id in user_group_id_list: - user_group_list.extend(UserGroup.objects.filter(id=user_group_id)) +def perm_group_update(user_group_id, asset_groups_id_list): + user_group = UserGroup.objects.filter(id=user_group_id) + if user_group: + user_group = user_group[0] + old_asset_group = [perm.asset_group for perm in user_group.perm_set.all()] + new_asset_group = [] for asset_group_id in asset_groups_id_list: - asset_group_list.extend(BisGroup.objects.filter(id=asset_group_id)) + new_asset_group.extend(BisGroup.objects.filter(id=asset_group_id)) - perm.user_group.clear() - perm.asset_group.clear() - perm.user_group = user_group_list - perm.asset_group = asset_group_list + del_asset_group = [asset_group for asset_group in old_asset_group if asset_group not in new_asset_group] + add_asset_group = [asset_group for asset_group in new_asset_group if asset_group not in old_asset_group] + + for asset_group in del_asset_group: + Perm.objects.filter(user_group=user_group, asset_group=asset_group).delete() + + for asset_group in add_asset_group: + Perm(user_group=user_group, asset_group=asset_group).save() def perm_edit(request): if request.method == 'GET': header_title, path1, path2 = u'编辑授权', u'授权管理', u'授权编辑' - perm_id = request.GET.get('id', '') - perm = Perm.objects.filter(id=perm_id) - if perm: - perm = perm[0] - name = perm.name - comment = perm.comment - user_groups_select = perm.user_group.all() - asset_groups_select = perm.asset_group.all() - - user_groups_all = UserGroup.objects.all() + user_group_id = request.GET.get('id', '') + user_group = UserGroup.objects.filter(id=user_group_id) + if user_group: + user_group = user_group[0] asset_groups_all = BisGroup.objects.all() - - user_groups = [user_group for user_group in user_groups_all if user_group not in user_groups_select] + asset_groups_select = [perm.asset_group for perm in user_group.perm_set.all()] asset_groups = [asset_group for asset_group in asset_groups_all if asset_group not in asset_groups_select] else: - perm_id = request.POST.get('perm_id', '') - user_group_id_list = request.POST.getlist('user_groups_select') + user_group_id = request.POST.get('user_group_id') asset_group_id_list = request.POST.getlist('asset_groups_select') - perm_group_update(perm_id, user_group_id_list, asset_group_id_list) + perm_group_update(user_group_id, asset_group_id_list) return HttpResponseRedirect('/jperm/perm_list/') return render_to_response('jperm/perm_edit.html', locals(), context_instance=RequestContext(request)) diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index ce5c4fcd1..b91c91ddb 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -108,6 +108,27 @@ def dept_perm_count(dept_id): return 0 +@register.filter(name='ugrp_perm_agrp_count') +def ugrp_perm_agrp_count(user_group_id): + user_group = UserGroup.objects.filter(id=user_group_id) + if user_group: + user_group = user_group[0] + return user_group.perm_set.all().count() + return 0 + + +@register.filter(name='ugrp_perm_asset_count') +def ugrp_perm_asset_count(user_group_id): + user_group = UserGroup.objects.filter(id=user_group_id) + assets = [] + if user_group: + user_group = user_group[0] + asset_groups = [perm.asset_group for perm in user_group.perm_set.all()] + for asset_group in asset_groups: + assets.extend(asset_group.asset_set.all()) + return len(set(assets)) + + @register.filter(name='group_type_to_str') def group_type_to_str(type_name): group_types = { diff --git a/juser/urls.py b/juser/urls.py index 5b3b588fa..8bc6c6f6e 100644 --- a/juser/urls.py +++ b/juser/urls.py @@ -20,7 +20,7 @@ urlpatterns = patterns('juser.views', (r'^group_del_ajax/$', 'group_del_ajax'), (r'^group_edit/$', 'group_edit'), (r'^user_add/$', 'user_add'), - (r'^user_list/$', 'user_list'), + (r'^user_list/(?P