github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

fix issues

pull/410/head
vapao 2021-09-28 13:27:25 +08:00
parent 05ff30e33d
commit 804107196a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spug_api/apps/host/group.py
View File

@ -5,6 +5,7 @@ from django.views.generic import View
from django.db.models import F from django.db.models import F
from libs import json_response, JsonParser, Argument from libs import json_response, JsonParser, Argument
from apps.host.models import Group from apps.host.models import Group
from apps.account.models import Role
def fetch_children(data, with_hosts): def fetch_children(data, with_hosts):
@ -113,5 +114,8 @@ class GroupView(View):
return json_response(error='请移除分组下的主机后再尝试删除') return json_response(error='请移除分组下的主机后再尝试删除')
if not Group.objects.exclude(pk=form.id).exists(): if not Group.objects.exclude(pk=form.id).exists():
return json_response(error='请至少保留一个分组') 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() group.delete()
return json_response(error=error) return json_response(error=error)

1
spug_web/src/pages/host/Selector.js
View File

@ -69,7 +69,6 @@ export default observer(function (props) {
if (props.oneGroup) setSelectedRowKeys([]) if (props.oneGroup) setSelectedRowKeys([])
} }
console.log(JSON.stringify(group))
return ( return (
<Modal <Modal
visible={[undefined, true].includes(props.visible)} visible={[undefined, true].includes(props.visible)}