From 69b91df96b2f45265d16b8fae08a60142ada2e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=AB=E5=8D=83=E6=B5=81?=
 <40739051+jym503558564@users.noreply.github.com>
Date: Wed, 12 Jun 2019 17:49:30 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=E4=BC=98=E5=8C=96=E8=B5=84=E4=BA=A7?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=8A=82=E7=82=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#2786)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update]优化资产设置节点的问题

* [Update]优化资产创建的节点设置
---
 apps/assets/api/asset.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py
index c7bbeb094..39182fbf6 100644
--- a/apps/assets/api/asset.py
+++ b/apps/assets/api/asset.py
@@ -51,10 +51,12 @@ class AssetViewSet(IDInCacheFilterMixin, LabelFilter, BulkModelViewSet):
     def set_assets_node(self, assets):
         if not isinstance(assets, list):
             assets = [assets]
-        node = Node.root()
         node_id = self.request.query_params.get('node_id')
-        if node_id:
-            node = get_object_or_none(Node, pk=node_id)
+        if not node_id:
+            return
+        node = get_object_or_none(Node, pk=node_id)
+        if not node:
+            return
         node.assets.add(*assets)
 
     def perform_create(self, serializer):