From 910dd4e5936cf83df6649c3b8948b88ae1a89937 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 16 Oct 2018 12:03:11 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/node.py | 8 +++++--- apps/assets/views/asset.py | 5 +---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index 54535fb0a..009527908 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -203,12 +203,14 @@ class Node(OrgModelMixin): # 如果使用current_org 在set_current_org时会死循环 _current_org = get_current_org() with transaction.atomic(): - if _current_org.is_default(): + if _current_org.is_root(): key = '0' + elif _current_org.is_default(): + key = '1' else: set_current_org(Organization.root()) org_nodes_roots = cls.objects.filter(key__regex=r'^[0-9]+$') - org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True) or [0] + org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True) or ['1'] key = str(max([int(k) for k in org_nodes_roots_keys]) + 1) set_current_org(_current_org) root = cls.objects.create(key=key, value=_current_org.name) @@ -225,7 +227,7 @@ class Node(OrgModelMixin): @classmethod def default_node(cls): defaults = {'value': 'Default'} - return cls.objects.get_or_create(defaults=defaults, key='0') + return cls.objects.get_or_create(defaults=defaults, key='1') @classmethod def get_tree_name_ref(cls): diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py index c36ad9cc9..ceb8c1404 100644 --- a/apps/assets/views/asset.py +++ b/apps/assets/views/asset.py @@ -45,10 +45,7 @@ class AssetListView(AdminUserRequiredMixin, TemplateView): template_name = 'assets/asset_list.html' def get_context_data(self, **kwargs): - if current_org.is_default(): - Node.default_node() - else: - Node.root() + Node.root() context = { 'app': _('Assets'), 'action': _('Asset list'),