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

[Update] 修改获取资产时使用in (#3053)

pull/3054/head
老广 2019-07-30 17:46:27 +08:00 committed by GitHub
parent c706a410a2
commit bb235f3e88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/assets/utils.py
View File

@ -213,10 +213,10 @@ class NodeUtil:
children.add(node) children.add(node)
return list(children) return list(children)
def get_children(self, node, with_self=True): def get_all_children(self, node, with_self=True):
return self.get_all_children_by_key(node.key, with_self=with_self) return self.get_all_children_by_key(node.key, with_self=with_self)
def get_children_keys_by_key(self, key, with_self=True): def get_all_children_keys_by_key(self, key, with_self=True):
nodes = self.get_all_children_by_key(key, with_self=with_self) nodes = self.get_all_children_by_key(key, with_self=with_self)
return [n.key for n in nodes] return [n.key for n in nodes]

13
apps/perms/utils/asset_permission.py
View File

@ -449,6 +449,8 @@ class AssetPermissionUtil(AssetPermissionCacheMixin):
self._nodes = None self._nodes = None
self._assets_direct = None self._assets_direct = None
self._nodes_direct = None self._nodes_direct = None
self.node_util = NodeUtil()
self.tree._node_util = self.node_util
@staticmethod @staticmethod
def change_org_if_need(): def change_org_if_need():
@ -491,13 +493,14 @@ class AssetPermissionUtil(AssetPermissionCacheMixin):
self.tree.add_nodes(nodes_keys) self.tree.add_nodes(nodes_keys)
pattern = set() all_nodes_keys = set()
for key in nodes_keys: for key in nodes_keys:
pattern.add(r'^{0}$|^{0}:'.format(key)) children_keys = self.node_util.get_all_children_keys_by_key(key)
pattern = '|'.join(list(pattern)) all_nodes_keys.update(set(children_keys))
if pattern:
if all_nodes_keys:
assets_ids = Asset.objects.filter( assets_ids = Asset.objects.filter(
nodes__key__regex=pattern nodes__key__in=all_nodes_keys
).valid().values_list("id", flat=True).distinct() ).valid().values_list("id", flat=True).distinct()
else: else:
assets_ids = [] assets_ids = []