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

Merge pull request #3342 from jumpserver/perms_assets_search_bug 

[Bugfix] 修复资产授权列表搜索 【node:node_name】/【node_id:node_id】/【is_valid:false】 出现500错误
pull/3359/head
BaiJiangJie 2019-10-18 16:21:26 +08:00 committed by GitHub
parent 491f59026c 70664d435f
commit a978bf990d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/perms/api/asset_permission.py
View File

@ -73,14 +73,17 @@ class AssetPermissionViewSet(OrgModelViewSet):
node_id = self.request.query_params.get('node_id') node_id = self.request.query_params.get('node_id')
node_name = self.request.query_params.get('node') node_name = self.request.query_params.get('node')
if node_id: if node_id:
node = get_object_or_none(Node, pk=node_id) _nodes = Node.objects.filter(pk=node_id)
elif node_name: elif node_name:
node = get_object_or_none(Node, name=node_name) _nodes = Node.objects.filter(value=node_name)
else: else:
return queryset return queryset
if not node: if not _nodes:
return queryset.none() return queryset.none()
nodes = node.get_ancestors(with_self=True)
nodes = set()
for node in _nodes:
nodes |= set(node.get_ancestors(with_self=True))
queryset = queryset.filter(nodes__in=nodes) queryset = queryset.filter(nodes__in=nodes)
return queryset return queryset

2
apps/perms/models/base.py
View File

@ -29,7 +29,7 @@ class BasePermissionQuerySet(models.QuerySet):
return self.filter(is_active=False) return self.filter(is_active=False)
def invalid(self): def invalid(self):
now = timezone.now now = timezone.now()
q = ( q = (
Q(is_active=False) | Q(is_active=False) |
Q(date_start__gt=now) | Q(date_start__gt=now) |