From e22e832d49b7e6556c4cf894af0f225024bc48ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Fri, 30 Nov 2018 15:39:13 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=20=E8=8A=82=E7=82=B9=E5=92=8C?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=98=AF=E5=A2=9E=E5=8A=A0=E8=80=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=E8=A6=86=E7=9B=96=20(#2115)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/assets/forms/asset.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py
index 28c78e981..1ec2ea24f 100644
--- a/apps/assets/forms/asset.py
+++ b/apps/assets/forms/asset.py
@@ -142,14 +142,14 @@ class AssetBulkUpdateForm(OrgModelForm):
                         if k in changed_fields}
         assets = cleaned_data.pop('assets')
         labels = cleaned_data.pop('labels', [])
-        nodes = cleaned_data.pop('nodes')
+        nodes = cleaned_data.pop('nodes', None)
         assets = Asset.objects.filter(id__in=[asset.id for asset in assets])
         assets.update(**cleaned_data)
 
         if labels:
-            for label in labels:
-                label.assets.add(*tuple(assets))
+            for asset in assets:
+                asset.labels.set(labels)
         if nodes:
-            for node in nodes:
-                node.assets.add(*tuple(assets))
+            for asset in assets:
+                asset.nodes.set(nodes)
         return assets