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

[Update] 修改获取资产distinct

pull/1946/head
BaiJiangJie 2018-10-24 13:05:32 +08:00
parent 41a8831034
commit 5c002e91ee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,14 +53,14 @@ class AssetViewSet(IDInFilterMixin, LabelFilter, BulkModelViewSet):
if show_current_asset: if show_current_asset:
self.queryset = self.queryset.filter( self.queryset = self.queryset.filter(
Q(nodes=node_id) | Q(nodes__isnull=True) Q(nodes=node_id) | Q(nodes__isnull=True)
).distinct() )
return return
if show_current_asset: if show_current_asset:
self.queryset = self.queryset.filter(nodes=node).distinct() self.queryset = self.queryset.filter(nodes=node)
else: else:
self.queryset = self.queryset.filter( self.queryset = self.queryset.filter(
nodes__key__regex='^{}(:[0-9]+)*$'.format(node.key), nodes__key__regex='^{}(:[0-9]+)*$'.format(node.key),
).distinct() )
def filter_admin_user_id(self): def filter_admin_user_id(self):
admin_user_id = self.request.query_params.get('admin_user_id') admin_user_id = self.request.query_params.get('admin_user_id')

2
apps/assets/models/node.py
View File

@ -124,7 +124,7 @@ class Node(OrgModelMixin):
assets = Asset.objects.filter(Q(nodes__id=self.id) | Q(nodes__isnull=True)) assets = Asset.objects.filter(Q(nodes__id=self.id) | Q(nodes__isnull=True))
else: else:
assets = Asset.objects.filter(nodes__id=self.id) assets = Asset.objects.filter(nodes__id=self.id)
return assets return assets.distinct()
def get_valid_assets(self): def get_valid_assets(self):
return self.get_assets().valid() return self.get_assets().valid()