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

delete ci...

This commit is contained in:
pycook 2016-06-27 10:46:04 +08:00 committed by pycook
parent 99870b33de
commit 89fa687bba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ci.py
View File

@ -241,8 +241,8 @@ class CIManager(object):
CIRelation.first_ci_id == ci_id).delete() CIRelation.first_ci_id == ci_id).delete()
db.session.query(CIRelation).filter( db.session.query(CIRelation).filter(
CIRelation.second_ci_id == ci_id).delete() CIRelation.second_ci_id == ci_id).delete()
db.session.query(CIAttributeHistory).filter( # db.session.query(CIAttributeHistory).filter(
CIAttributeHistory.ci_id == ci_id).delete() # CIAttributeHistory.ci_id == ci_id).delete()
db.session.flush() db.session.flush()
db.session.delete(ci) db.session.delete(ci)
@ -252,7 +252,7 @@ class CIManager(object):
db.session.rollback() db.session.rollback()
current_app.logger.error("delete CI error, {0}".format(str(e))) current_app.logger.error("delete CI error, {0}".format(str(e)))
return abort(400, "delete CI error, {0}".format(str(e))) return abort(400, "delete CI error, {0}".format(str(e)))
# TODO: write history # todo: write history
ci_delete.apply_async([ci.ci_id], queue="cmdb_async") ci_delete.apply_async([ci.ci_id], queue="cmdb_async")
return ci_id return ci_id
return abort(404, "CI {0} not found".format(ci_id)) return abort(404, "CI {0} not found".format(ci_id))