diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py index 5c4802fa7..54f0bacc2 100644 --- a/apps/assets/api/asset.py +++ b/apps/assets/api/asset.py @@ -74,7 +74,7 @@ class AssetViewSet(IDInFilterMixin, LabelFilter, BulkModelViewSet): .select_related('admin_user') self.filter_admin_user_id() self.filter_node() - return self.queryset + return self.queryset.distinct() class AssetListUpdateApi(IDInFilterMixin, ListBulkCreateUpdateDestroyAPIView): diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index 35a55fe02..8876fc2f1 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -138,7 +138,7 @@ class Node(OrgModelMixin): args.append(Q(nodes__key__regex=pattern) | Q(nodes=None)) else: kwargs['nodes__key__regex'] = pattern - assets = Asset.objects.filter(*args, **kwargs) + assets = Asset.objects.filter(*args, **kwargs).distinct() return assets def get_all_valid_assets(self):