From 2c18a27e3a5936d26bf0d8e60891b8f3f97c8b9f Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 16 Oct 2018 12:37:42 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/asset.py | 3 ++- apps/assets/models/node.py | 3 ++- apps/orgs/mixins.py | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py index 55fb1723a..120a95689 100644 --- a/apps/assets/models/asset.py +++ b/apps/assets/models/asset.py @@ -34,7 +34,8 @@ def default_cluster(): def default_node(): try: from .node import Node - return Node.root() + root = Node.root() + return root except: return None diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index 009527908..35a55fe02 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -211,7 +211,8 @@ class Node(OrgModelMixin): 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 ['1'] - key = str(max([int(k) for k in org_nodes_roots_keys]) + 1) + key = max([int(k) for k in org_nodes_roots_keys]) + key = str(key + 1) if key != 0 else '2' set_current_org(_current_org) root = cls.objects.create(key=key, value=_current_org.name) return root diff --git a/apps/orgs/mixins.py b/apps/orgs/mixins.py index 29ec794f1..917a220bf 100644 --- a/apps/orgs/mixins.py +++ b/apps/orgs/mixins.py @@ -4,7 +4,6 @@ from werkzeug.local import Local from django.db import models from django.utils.translation import ugettext_lazy as _ -from django.db.models import Q from django.shortcuts import redirect from django.forms import ModelForm from django.http.response import HttpResponseForbidden