From e724ffbebd02dcc6a5217565a8e6426703f1c5f4 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Tue, 1 Jul 2025 11:57:42 +0800 Subject: [PATCH] refactor: simplify query set handling in tool.py and list_tool_user.sql --- apps/tools/serializers/tool.py | 2 +- apps/tools/sql/list_tool_user.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tools/serializers/tool.py b/apps/tools/serializers/tool.py index f8cbb94c7..4fcdd6d05 100644 --- a/apps/tools/serializers/tool.py +++ b/apps/tools/serializers/tool.py @@ -606,7 +606,7 @@ class ToolTreeSerializer(serializers.Serializer): 'tool_query_set': tool_query_set, 'default_query_set': default_query_set, } - if not workspace_manage and is_x_pack_ee: + if not workspace_manage: query_set_dict['workspace_user_resource_permission_query_set'] = QuerySet( WorkspaceUserResourcePermission).filter( auth_target_type="TOOL", diff --git a/apps/tools/sql/list_tool_user.sql b/apps/tools/sql/list_tool_user.sql index 07c1c471a..7a39c73b5 100644 --- a/apps/tools/sql/list_tool_user.sql +++ b/apps/tools/sql/list_tool_user.sql @@ -21,7 +21,7 @@ FROM (SELECT tool."id"::text, FROM tool tool ${tool_query_set} AND tool.id IN (SELECT target FROM workspace_user_resource_permission - WHERE auth_target_type = 'TOOL' + ${workspace_user_resource_permission_query_set} AND 'VIEW' = ANY (permission_list))) AS tool LEFT JOIN "user" ON "user".id = user_id