7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug 1217 (#656) 

* fix(api): move soft delete of PreferenceShowAttributes to correct location

* chore: add manage.sh to .gitignore

* fix(api): correct type_id reference in CITypeAttributeManager for PreferenceShowAttributes soft delete

* Update .gitignore

---------

Co-authored-by: pycook <pycook@126.com>
This commit is contained in:
thexqn 2024-12-20 16:47:25 +08:00 committed by GitHub
parent ada23262bb
commit 747475b6a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -78,7 +78,3 @@ cmdb-ui/npm-debug.log*
cmdb-ui/yarn-debug.log* cmdb-ui/yarn-debug.log*
cmdb-ui/yarn-error.log* cmdb-ui/yarn-error.log*
cmdb-ui/package-lock.json cmdb-ui/package-lock.json
start.sh
manage.sh
.env
cmdb-api/.env

6
cmdb-api/api/lib/cmdb/ci_type.py
View File

@ -722,9 +722,6 @@ class CITypeAttributeManager(object):
ci_cache.apply_async(args=(ci.id, None, None), queue=CMDB_QUEUE) ci_cache.apply_async(args=(ci.id, None, None), queue=CMDB_QUEUE)
for item in PreferenceShowAttributes.get_by(type_id=type_id, attr_id=attr_id, to_dict=False):
item.soft_delete(commit=False)
child_ids = CITypeInheritanceManager.recursive_children(type_id) child_ids = CITypeInheritanceManager.recursive_children(type_id)
for _type_id in [type_id] + child_ids: for _type_id in [type_id] + child_ids:
for item in CITypeUniqueConstraint.get_by(type_id=_type_id, to_dict=False): for item in CITypeUniqueConstraint.get_by(type_id=_type_id, to_dict=False):
@ -740,6 +737,9 @@ class CITypeAttributeManager(object):
item = CITypeTrigger.get_by(type_id=_type_id, attr_id=attr_id, to_dict=False, first=True) item = CITypeTrigger.get_by(type_id=_type_id, attr_id=attr_id, to_dict=False, first=True)
item and item.soft_delete(commit=False) item and item.soft_delete(commit=False)
for item in PreferenceShowAttributes.get_by(type_id=_type_id, attr_id=attr_id, to_dict=False):
item.soft_delete(commit=False)
for item in (CITypeRelation.get_by(parent_id=type_id, to_dict=False) + for item in (CITypeRelation.get_by(parent_id=type_id, to_dict=False) +
CITypeRelation.get_by(child_id=type_id, to_dict=False)): CITypeRelation.get_by(child_id=type_id, to_dict=False)):
if item.parent_id == type_id and attr_id in (item.parent_attr_ids or []): if item.parent_id == type_id and attr_id in (item.parent_attr_ids or []):