Skip to content

J
jumpserver
Commit 782bad91 authored by ibuler's avatar ibuler
Browse files
Options

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

parents 1472f043 1256944b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
apps/assets/models/node.py
View file @ 782bad91
...@@ -406,7 +406,7 @@ class Node(OrgModelMixin, FamilyMixin, FullValueMixin, AssetsAmountMixin): ...@@ -406,7 +406,7 @@ class Node(OrgModelMixin, FamilyMixin, FullValueMixin, AssetsAmountMixin):
return tree_node return tree_node
def delete(self, using=None, keep_parents=False): 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
return super().delete(using=using, keep_parents=keep_parents) return super().delete(using=using, keep_parents=keep_parents)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment