github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-29 21:51:31 +00:00
Code Issues Projects Releases Wiki Activity

perf: Admin and auditor can view and stop task

Browse Source
This commit is contained in:
wangruidong
2024-11-08 17:50:33 +08:00
committed by Bryan
parent 1a41a7450e
commit 5b27acf4ef
11 changed files with 75 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ops/utils.py
View File

@@ -45,6 +45,6 @@ def merge_nodes_and_assets(nodes, assets, user):
elif node_id == PermNode.UNGROUPED_NODE_KEY:
node_assets = perm_util.get_ungroup_assets()
else:
_, node_assets = perm_util.get_node_all_assets(node_id)
node, node_assets = perm_util.get_node_all_assets(node_id)
assets.extend(node_assets.exclude(id__in=[asset.id for asset in assets]))
return assets