From 047dda5ab3eddd5b5d258eaff390e58b6a9bf97b Mon Sep 17 00:00:00 2001 From: guanghongwei Date: Tue, 27 Jan 2015 17:56:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84group?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jumpserver/templatetags/mytags.py | 4 +++- juser/views.py | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index dedb756cc..1ade513fc 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -2,7 +2,7 @@ import time from django import template -from juser.models import User +from juser.models import User, UserGroup register = template.Library() @@ -31,8 +31,10 @@ def get_role(user_id): def groups_str(username): groups = [] user = User.objects.get(username=username) + group_default = UserGroup.objects.get(name=username) for group in user.user_group.all(): groups.append(group.name) + groups.remove(group_default) return ','.join(groups) @register.filter(name='get_item') diff --git a/juser/views.py b/juser/views.py index b110d9b10..d8c709ced 100644 --- a/juser/views.py +++ b/juser/views.py @@ -143,15 +143,11 @@ def group_add(request): if not group_name: error = u'组名不能为空' raise AddError - group_db_add(name=group_name, comment=comment, type='M') - except AddError: pass - except TypeError: error = u'保存用户失败' - else: msg = u'添加组 %s 成功' % group_name