github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #10754 from jumpserver/pr@dev@fix_permed_asset_duplicate 

fix: 修复授权资产根据协议搜索重复的问题
pull/10756/head
老广 2023-06-16 16:53:43 +08:00 committed by GitHub
parent dd955530f1 f4b5a302a1
commit f13966e061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/assets/api/asset/asset.py
View File

@ -82,7 +82,7 @@ class AssetFilterSet(BaseFilterSet):
@staticmethod @staticmethod
def filter_protocols(queryset, name, value): def filter_protocols(queryset, name, value):
value = value.split(',') value = value.split(',')
return queryset.filter(protocols__name__in=value) return queryset.filter(protocols__name__in=value).distinct()
@staticmethod @staticmethod
def filter_labels(queryset, name, value): def filter_labels(queryset, name, value):
@ -91,7 +91,7 @@ class AssetFilterSet(BaseFilterSet):
queryset = queryset.filter(labels__name=n, labels__value=v) queryset = queryset.filter(labels__name=n, labels__value=v)
else: else:
q = Q(labels__name__contains=value) | Q(labels__value__contains=value) q = Q(labels__name__contains=value) | Q(labels__value__contains=value)
queryset = queryset.filter(q) queryset = queryset.filter(q).distinct()
return queryset return queryset