fix(perms): 作业中心-批量命令-选择系统用户之后,左侧资产列表未筛选,还是全部资产

This commit is contained in:
xinwen
2020-11-17 18:27:09 +08:00
committed by 老广
parent 31cd441a34
commit 3e78d627f8
4 changed files with 139 additions and 29 deletions

View File

@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
#
import abc
from django.conf import settings
from rest_framework.generics import (
ListAPIView
)
@@ -16,7 +17,8 @@ from perms.utils.asset.user_permission import (
get_indirect_granted_node_children,
get_user_granted_nodes_list_via_mapping_node,
get_top_level_granted_nodes,
rebuild_user_tree_if_need,
rebuild_user_tree_if_need, get_favorite_node,
get_ungrouped_node
)
@@ -113,7 +115,12 @@ class UserGrantedNodesMixin:
user: User
def get_nodes(self):
return get_user_granted_nodes_list_via_mapping_node(self.user)
nodes = []
if settings.PERM_SINGLE_ASSET_TO_UNGROUP_NODE:
nodes.append(get_ungrouped_node(self.user))
nodes.append(get_favorite_node(self.user))
nodes.extend(get_user_granted_nodes_list_via_mapping_node(self.user))
return nodes
# ------------------------------------------