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

fix: delete attribute

This commit is contained in:
pycook 2020-03-23 15:49:33 +08:00
parent ccccce262f
commit 84b7b53a73
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ from api.lib.cmdb.utils import ValueTypeMap
from api.lib.decorator import kwargs_required from api.lib.decorator import kwargs_required
from api.models.cmdb import Attribute from api.models.cmdb import Attribute
from api.models.cmdb import CITypeAttribute from api.models.cmdb import CITypeAttribute
from api.models.cmdb import CITypeAttributeGroupItem
from api.models.cmdb import PreferenceShowAttributes from api.models.cmdb import PreferenceShowAttributes
@ -39,6 +40,13 @@ class AttributeManager(object):
db.session.add(table) db.session.add(table)
db.session.flush() db.session.flush()
@staticmethod
def _del_choice_values(_id, value_type):
choice_table = ValueTypeMap.choice.get(value_type)
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):
""" """
@ -150,11 +158,14 @@ class AttributeManager(object):
choice_value = kwargs.pop("choice_value", False) choice_value = kwargs.pop("choice_value", False)
is_choice = True if choice_value else False is_choice = True if choice_value else False
kwargs['is_choice'] = is_choice
attr.update(flush=True, **kwargs) attr.update(flush=True, **kwargs)
if is_choice: if is_choice:
self._add_choice_values(attr.id, attr.value_type, choice_value) self._add_choice_values(attr.id, attr.value_type, choice_value)
else:
self._del_choice_values(attr.id, attr.value_type)
try: try:
db.session.commit() db.session.commit()
@ -187,4 +198,7 @@ class AttributeManager(object):
for i in PreferenceShowAttributes.get_by(attr_id=_id, to_dict=False): for i in PreferenceShowAttributes.get_by(attr_id=_id, to_dict=False):
i.soft_delete() i.soft_delete()
for i in CITypeAttributeGroupItem.get_by(attr_id=_id, to_dict=False):
i.soft_delete()
return name return name