@@ -571,7 +571,7 @@ def page_tool(self, current_page: int, page_size: int):
571571 )
572572 return page_search (current_page , page_size , tools , lambda record : ToolModelSerializer (record ).data )
573573
574- def get_query_set (self ):
574+ def get_query_set (self , workspace_manage , is_x_pack_ee ):
575575 tool_query_set = QuerySet (Tool ).filter (workspace_id = self .data .get ('workspace_id' ))
576576 folder_query_set = QuerySet (ToolFolder )
577577 default_query_set = QuerySet (Tool )
@@ -601,16 +601,19 @@ def get_query_set(self):
601601 if scope is not None :
602602 tool_query_set = tool_query_set .filter (scope = scope )
603603
604- return {
604+ query_set_dict = {
605605 'folder_query_set' : folder_query_set ,
606606 'tool_query_set' : tool_query_set ,
607607 'default_query_set' : default_query_set ,
608- 'workspace_user_resource_permission_query_set' : QuerySet (WorkspaceUserResourcePermission ).filter (
608+ }
609+ if not workspace_manage and is_x_pack_ee :
610+ query_set_dict ['workspace_user_resource_permission_query_set' ] = QuerySet (
611+ WorkspaceUserResourcePermission ).filter (
609612 auth_target_type = "TOOL" ,
610613 workspace_id = workspace_id ,
611614 user_id = user_id
612615 )
613- }
616+ return query_set_dict
614617
615618 @staticmethod
616619 def is_x_pack_ee ():
@@ -625,7 +628,7 @@ def page_tool_with_folders(self, current_page: int, page_size: int):
625628 is_x_pack_ee = self .is_x_pack_ee ()
626629
627630 return native_page_search (
628- current_page , page_size , self .get_query_set (),
631+ current_page , page_size , self .get_query_set (workspace_manage , is_x_pack_ee ),
629632 get_file_content (
630633 os .path .join (
631634 PROJECT_DIR ,
0 commit comments