diff --git a/jumpserver.conf b/jumpserver.conf index c4d2946798a131ba6b597907f7502fe101411e87..49f135076d921420d1e5b8ad466f5348bfcdb8fc 100644 --- a/jumpserver.conf +++ b/jumpserver.conf @@ -30,5 +30,5 @@ web_socket_host = 192.168.40.140:3000 email_host = smtp.qq.com email_port = 25 email_host_user = 1152704203@qq.com -email_host_password = xxxxx +email_host_password = Hudie117... email_use_tls = False diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index ee2f05c13252b5defaaa96d82d020720313ac150..6f7567b51ff698872fbdf55c32517549fa1b7757 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -359,18 +359,12 @@ def sudo_cmd_count(user_group_id): @register.filter(name='sudo_cmd_count') -def sudo_cmd_count(user_group_id): - user_group = UserGroup.objects.filter(id=user_group_id) +def sudo_cmd_count(cmd_group_id): + cmd_group = CmdGroup.objects.filter(id=cmd_group_id) cmds = [] - if user_group: - user_group = user_group[0] - cmd_groups = [] - for perm in user_group.sudoperm_set.all(): - cmd_groups.extend(perm.cmd_group.all()) - - for cmd_group in cmd_groups: - cmds.extend(cmd_group.cmd.split(',')) - return len(set(cmds)) + if cmd_group: + cmd_group = cmd_group[0] + return len(set(cmd_group.cmd.split(','))) else: return 0 diff --git a/templates/jperm/sudo_detail.html b/templates/jperm/sudo_detail.html index c732a4b3728696727131f083bc7550671f57082a..1f547d8c2b17ce96f74988d9a7bd7630c294b33f 100644 --- a/templates/jperm/sudo_detail.html +++ b/templates/jperm/sudo_detail.html @@ -143,7 +143,7 @@ <i class="fa fa-linux"></i> <b>{{ cmd_group.name }}</b> <br> - <small class="text-navy">共: {{ cmd_group.id|sudo_cmd_count }} 个</small> + <small class="text-navy">共: {{ cmd_group.id | sudo_cmd_count }} 个</small> </div> <div class="col-xs-7 content no-top-border"> <p class="m-b-xs"><strong>{{ group.comment }}</strong></p>