From 804107196a45bfa689db6d0ceb570be4ac386356 Mon Sep 17 00:00:00 2001 From: vapao Date: Tue, 28 Sep 2021 13:27:25 +0800 Subject: [PATCH] fix issues --- spug_api/apps/host/group.py | 4 ++++ spug_web/src/pages/host/Selector.js | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/spug_api/apps/host/group.py b/spug_api/apps/host/group.py index b4a8644..bde18fe 100644 --- a/spug_api/apps/host/group.py +++ b/spug_api/apps/host/group.py @@ -5,6 +5,7 @@ from django.views.generic import View from django.db.models import F from libs import json_response, JsonParser, Argument from apps.host.models import Group +from apps.account.models import Role def fetch_children(data, with_hosts): @@ -113,5 +114,8 @@ class GroupView(View): return json_response(error='请移除分组下的主机后再尝试删除') if not Group.objects.exclude(pk=form.id).exists(): return json_response(error='请至少保留一个分组') + role = Role.objects.filter(group_perms__regex=fr'[^0-9]{form.id}[^0-9]').first() + if role: + return json_response(error=f'账户角色【{role.name}】的主机权限关联该分组，请解除关联后再尝试删除') group.delete() return json_response(error=error) diff --git a/spug_web/src/pages/host/Selector.js b/spug_web/src/pages/host/Selector.js index 7b53a1d..363893b 100644 --- a/spug_web/src/pages/host/Selector.js +++ b/spug_web/src/pages/host/Selector.js @@ -69,7 +69,6 @@ export default observer(function (props) { if (props.oneGroup) setSelectedRowKeys([]) } - console.log(JSON.stringify(group)) return (