From 3d4b84909ed5194797930b59dacf3a0b8a83fd20 Mon Sep 17 00:00:00 2001 From: pycook Date: Thu, 12 Dec 2019 21:36:33 +0800 Subject: [PATCH] fix delete relation view --- api/lib/cmdb/ci_type.py | 5 +++++ api/lib/cmdb/preference.py | 3 +++ 2 files changed, 8 insertions(+) diff --git a/api/lib/cmdb/ci_type.py b/api/lib/cmdb/ci_type.py index 3af4ebf..6c32746 100644 --- a/api/lib/cmdb/ci_type.py +++ b/api/lib/cmdb/ci_type.py @@ -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 diff --git a/api/lib/cmdb/preference.py b/api/lib/cmdb/preference.py index 1da4b37..d7affc7 100644 --- a/api/lib/cmdb/preference.py +++ b/api/lib/cmdb/preference.py @@ -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