From a1440ee4e01750a79814bdc36f643b0a029e1fa3 Mon Sep 17 00:00:00 2001 From: ibuler Date: Sun, 19 Feb 2023 15:43:56 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20asset=20=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=20nodes=20=E5=8F=AF=E8=83=BD=E6=9C=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/asset/common.py | 4 +--- apps/assets/serializers/asset/common.py | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/assets/models/asset/common.py b/apps/assets/models/asset/common.py index fba640e2f..8fd2d8a2c 100644 --- a/apps/assets/models/asset/common.py +++ b/apps/assets/models/asset/common.py @@ -21,9 +21,7 @@ logger = logging.getLogger(__name__) def default_node(): - from orgs.utils import current_org - from ..node import Node - return Node(id=current_org.id) + return [] class AssetManager(OrgManager): diff --git a/apps/assets/serializers/asset/common.py b/apps/assets/serializers/asset/common.py index ded10161d..0d4939086 100644 --- a/apps/assets/serializers/asset/common.py +++ b/apps/assets/serializers/asset/common.py @@ -227,6 +227,9 @@ class AssetSerializer(BulkOrgResourceModelSerializer, WritableNestedModelSeriali def validate_nodes(self, nodes): if nodes: return nodes + nodes_display = self.initial_data.get('nodes_display') + if nodes_display: + return nodes request = self.context.get('request') if not request: return []