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

Merge pull request #4021 from jumpserver/dev_asset 

[Bugfix] 修复只显示当前节点下资产不生效的问题
pull/4022/head
BaiJiangJie 2020-05-20 18:21:59 +08:00 committed by GitHub
parent 4ec4869896 7c44f74068
commit 2053e9210e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/assets/filters.py
View File

@ -58,7 +58,9 @@ class AssetByNodeFilterBackend(filters.BaseFilterBackend):
if query_all: if query_all:
pattern = node.get_all_children_pattern(with_self=True) pattern = node.get_all_children_pattern(with_self=True)
else: else:
pattern = node.get_children_key_pattern(with_self=True) # pattern = node.get_children_key_pattern(with_self=True)
# 只显示当前节点下资产
pattern = r"^{}$".format(node.key)
return self.perform_query(pattern, queryset) return self.perform_query(pattern, queryset)