Skip to content

Commit ad5c812

Browse files
committed
refactor: remove unnecessary condition for workspace management in knowledge.py and update SQL query in list_knowledge_user.sql
1 parent e724ffb commit ad5c812

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

apps/knowledge/serializers/knowledge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def get_query_set(self, workspace_manage, is_x_pack_ee):
160160
'knowledge.workspace_id': models.CharField(),
161161
})).filter(**{'knowledge.workspace_id': workspace_id})
162162
query_set_dict['folder_query_set'] = folder_query_set
163-
if not workspace_manage and is_x_pack_ee:
163+
if not workspace_manage:
164164
query_set_dict['workspace_user_resource_permission_query_set'] = QuerySet(
165165
WorkspaceUserResourcePermission).filter(
166166
auth_target_type="KNOWLEDGE",

apps/knowledge/sql/list_knowledge_user.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ FROM (SELECT "temp_knowledge".id::text, "temp_knowledge".name,
2222
FROM knowledge knowledge ${knowledge_custom_sql}
2323
AND id in (select target
2424
from workspace_user_resource_permission
25-
where auth_target_type = 'KNOWLEDGE'
25+
${workspace_user_resource_permission_query_set}
2626
and 'VIEW' = any (permission_list))) temp_knowledge
2727
LEFT JOIN (SELECT "count"("id") AS document_count, "sum"("char_length") "char_length", knowledge_id
2828
FROM "document"

0 commit comments

Comments
 (0)