mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-08-15 12:54:14 +00:00
ʾĬϵgroup
This commit is contained in:
parent
3c8a9bab0c
commit
047dda5ab3
@ -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')
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user