zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: simplify query set handling in tool.py and list_tool_user.sql

Browse Source
This commit is contained in:
CaptainB 2025-07-01 11:57:42 +08:00
parent fedf1ef6fc
commit e724ffbebd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/tools/serializers/tool.py
View File

@ -606,7 +606,7 @@ class ToolTreeSerializer(serializers.Serializer):
'tool_query_set': tool_query_set, 'tool_query_set': tool_query_set,
'default_query_set': default_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( query_set_dict['workspace_user_resource_permission_query_set'] = QuerySet(
WorkspaceUserResourcePermission).filter( WorkspaceUserResourcePermission).filter(
auth_target_type="TOOL", auth_target_type="TOOL",

2
apps/tools/sql/list_tool_user.sql
View File

@ -21,7 +21,7 @@ FROM (SELECT tool."id"::text,
FROM tool tool ${tool_query_set} FROM tool tool ${tool_query_set}
AND tool.id IN (SELECT target AND tool.id IN (SELECT target
FROM workspace_user_resource_permission FROM workspace_user_resource_permission
WHERE auth_target_type = 'TOOL' ${workspace_user_resource_permission_query_set}
AND 'VIEW' = ANY (permission_list))) AS tool AND 'VIEW' = ANY (permission_list))) AS tool
LEFT JOIN "user" ON "user".id = user_id LEFT JOIN "user" ON "user".id = user_id