7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-11-04 13:46:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix delete relation view

Browse Source
This commit is contained in:
pycook
2019-12-12 21:36:33 +08:00
parent 1938da33cd
commit 91db0da353
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/lib/cmdb/ci_type.py
View File

@@ -131,6 +131,11 @@ class CITypeManager(object):
CITypeCache.clean(type_id)
if current_app.config.get("USE_ACL"):
from api.lib.perm.acl.acl import ACLManager
from api.lib.cmdb.const import ResourceTypeEnum, RoleEnum, PermEnum
ACLManager().del_resource(ci_type.name, ResourceTypeEnum.CI)
class CITypeGroupManager(object):
@staticmethod

3
api/lib/cmdb/preference.py
View File

@@ -192,4 +192,7 @@ class PreferenceManager(object):
for existed in PreferenceRelationView.get_by(name=name, to_dict=False):
existed.soft_delete()
if current_app.config.get("USE_ACL"):
ACLManager().del_resource(name, ResourceTypeEnum.RELATION_VIEW)
return name

4
docs/cmdb.sql
View File

@@ -65,7 +65,6 @@ CREATE TABLE `acl_permissions` (
`resource_type_id` int(11) DEFAULT NULL,
`app_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `perm_name_app_unique` (`name`,`resource_type_id`,`app_id`),
KEY `resource_type_id` (`resource_type_id`),
KEY `app_id` (`app_id`),
KEY `ix_acl_permissions_deleted` (`deleted`),
@@ -134,7 +133,6 @@ CREATE TABLE `acl_resource_groups` (
`resource_type_id` int(11) DEFAULT NULL,
`app_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `resource_group_app_unique` (`name`,`resource_type_id`,`app_id`),
KEY `resource_type_id` (`resource_type_id`),
KEY `app_id` (`app_id`),
KEY `ix_acl_resource_groups_name` (`name`),
@@ -204,7 +202,6 @@ CREATE TABLE `acl_resources` (
`resource_type_id` int(11) DEFAULT NULL,
`app_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `resource_name_app_unique` (`name`,`resource_type_id`,`app_id`),
KEY `resource_type_id` (`resource_type_id`),
KEY `app_id` (`app_id`),
KEY `ix_acl_resources_deleted` (`deleted`),
@@ -279,7 +276,6 @@ CREATE TABLE `acl_role_relations` (
`parent_id` int(11) DEFAULT NULL,
`child_id` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `role_relation_unique` (`parent_id`,`child_id`),
KEY `child_id` (`child_id`),
KEY `ix_acl_role_relations_deleted` (`deleted`),
CONSTRAINT `acl_role_relations_ibfk_1` FOREIGN KEY (`parent_id`) REFERENCES `acl_roles` (`id`),