From 41a88310349d297cb12abfce1940ad8ec771c77e Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Wed, 24 Oct 2018 12:13:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E8=A7=84=E5=88=99=E4=B8=8BDefault=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E8=B5=84=E4=BA=A7=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index 8876fc2f1..c157d9d58 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -121,7 +121,7 @@ class Node(OrgModelMixin): def get_assets(self): from .asset import Asset if self.is_default_node(): - assets = Asset.objects.filter(nodes__isnull=True) + assets = Asset.objects.filter(Q(nodes__id=self.id) | Q(nodes__isnull=True)) else: assets = Asset.objects.filter(nodes__id=self.id) return assets From 5c002e91ee2b1b04488b6a97716e8a593b7ebdd5 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Wed, 24 Oct 2018 13:05:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=B5=84=E4=BA=A7distinct?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/asset.py | 6 +++--- apps/assets/models/node.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py index 54f0bacc2..92a1775d0 100644 --- a/apps/assets/api/asset.py +++ b/apps/assets/api/asset.py @@ -53,14 +53,14 @@ class AssetViewSet(IDInFilterMixin, LabelFilter, BulkModelViewSet): if show_current_asset: self.queryset = self.queryset.filter( Q(nodes=node_id) | Q(nodes__isnull=True) - ).distinct() + ) return if show_current_asset: - self.queryset = self.queryset.filter(nodes=node).distinct() + self.queryset = self.queryset.filter(nodes=node) else: self.queryset = self.queryset.filter( nodes__key__regex='^{}(:[0-9]+)*$'.format(node.key), - ).distinct() + ) def filter_admin_user_id(self): admin_user_id = self.request.query_params.get('admin_user_id') diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index c157d9d58..b1dc64029 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -124,7 +124,7 @@ class Node(OrgModelMixin): assets = Asset.objects.filter(Q(nodes__id=self.id) | Q(nodes__isnull=True)) else: assets = Asset.objects.filter(nodes__id=self.id) - return assets + return assets.distinct() def get_valid_assets(self): return self.get_assets().valid()