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

5 years ago · 782bad916e
parent 1472f0437f 1256944b96
commit 782bad916e
1 changed files with 1 additions and 1 deletions
--- a/apps/assets/models/node.py
+++ b/apps/assets/models/node.py
@ -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)