fix: Node ordering [`parent_key`, `value`]; 修复默认组织Default节点显示问题(存在key为0的Default节点)

fedb650c · Bai · 老广 · a99cda7b · fedb650c
Commit fedb650c authored 4 years ago by Bai Committed by 老广 4 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 2 deletions
+3 -2
--- a/apps/assets/models/node.py
+++ b/apps/assets/models/node.py
@@ -354,7 +354,8 @@ class SomeNodesMixin:
    def org_root(cls):
        root = cls.objects.filter(parent_key='')\
            .filter(key__regex=r'^[0-9]+$')\
-            .exclude(key__startswith='-')
+            .exclude(key__startswith='-')\
+            .order_by('key')
        if root:
            return root[0]
        else:
@@ -411,7 +412,7 @@ class Node(OrgModelMixin, SomeNodesMixin, FamilyMixin, NodeAssetsMixin):

    class Meta:
        verbose_name = _("Node")
-        ordering = ['value']
+        ordering = ['parent_key', 'value']

    def __str__(self):
        return self.full_value