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()