github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bugfix' of github.com:jumpserver/jumpserver into bugfix

pull/2831/head
ibuler 2019-07-04 21:18:04 +08:00
parent 1472f0437f 1256944b96
commit 782bad916e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/models/node.py
View File

@ -406,7 +406,7 @@ class Node(OrgModelMixin, FamilyMixin, FullValueMixin, AssetsAmountMixin):
return tree_node
def delete(self, using=None, keep_parents=False):
if self.children or self.assets.get_assets():
if self.children or self.get_assets():
return
return super().delete(using=using, keep_parents=keep_parents)