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

fix delete choice values

This commit is contained in:
pycook 2023-08-31 16:02:24 +08:00
parent ff9af51465
commit 03f2ff912d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmdb-api/api/lib/cmdb/attribute.py
View File

@ -92,8 +92,9 @@ class AttributeManager(object):
def _del_choice_values(_id, value_type): def _del_choice_values(_id, value_type):
choice_table = ValueTypeMap.choice.get(value_type) choice_table = ValueTypeMap.choice.get(value_type)
db.session.query(choice_table).filter(choice_table.attr_id == _id).delete() if choice_table is not None:
db.session.flush() db.session.query(choice_table).filter(choice_table.attr_id == _id).delete()
db.session.flush()
@classmethod @classmethod
def search_attributes(cls, name=None, alias=None, page=1, page_size=None): def search_attributes(cls, name=None, alias=None, page=1, page_size=None):
@ -296,7 +297,7 @@ class AttributeManager(object):
if is_choice and choice_value: if is_choice and choice_value:
self.add_choice_values(attr.id, attr.value_type, choice_value) self.add_choice_values(attr.id, attr.value_type, choice_value)
elif not is_choice: elif existed2['is_choice']:
self._del_choice_values(attr.id, attr.value_type) self._del_choice_values(attr.id, attr.value_type)
try: try: