From cc692ffbe1fe1247c65f11be7dbdfc525eecee50 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Mon, 30 Jun 2025 10:53:35 +0800 Subject: [PATCH] feat: update permission constants to include ResourcePermission MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1057659 --user=刘瑞斌 【共享资源】企业版-创建共享工具失败 https://www.tapd.cn/62980211/s/1720006 --- apps/knowledge/serializers/knowledge.py | 6 +++--- apps/tools/serializers/tool.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/knowledge/serializers/knowledge.py b/apps/knowledge/serializers/knowledge.py index 7b37740b8..f1004937b 100644 --- a/apps/knowledge/serializers/knowledge.py +++ b/apps/knowledge/serializers/knowledge.py @@ -22,7 +22,7 @@ from rest_framework import serializers from application.models import ApplicationKnowledgeMapping from common.config.embedding_config import VectorStore from common.constants.cache_version import Cache_Version -from common.constants.permission_constants import ResourceAuthType, ResourcePermissionGroup +from common.constants.permission_constants import ResourceAuthType, ResourcePermissionGroup, ResourcePermission from common.database_model_manage.database_model_manage import DatabaseModelManage from common.db.search import native_search, get_dynamics_model, native_page_search from common.db.sql_execute import select_list @@ -536,7 +536,7 @@ class KnowledgeSerializer(serializers.Serializer): WorkspaceUserResourcePermission( target=knowledge_id, auth_target_type=AuthTargetType.KNOWLEDGE, - permission_list=[ResourcePermissionGroup.VIEW, ResourcePermissionGroup.MANAGE], + permission_list=[ResourcePermission.VIEW, ResourcePermission.MANAGE], workspace_id=self.data.get('workspace_id'), user_id=self.data.get('user_id'), auth_type=ResourceAuthType.RESOURCE_PERMISSION_GROUP @@ -587,7 +587,7 @@ class KnowledgeSerializer(serializers.Serializer): WorkspaceUserResourcePermission( target=knowledge_id, auth_target_type=AuthTargetType.KNOWLEDGE, - permission_list=[ResourcePermissionGroup.VIEW, ResourcePermissionGroup.MANAGE], + permission_list=[ResourcePermission.VIEW, ResourcePermission.MANAGE], workspace_id=self.data.get('workspace_id'), user_id=self.data.get('user_id'), auth_type=ResourceAuthType.RESOURCE_PERMISSION_GROUP diff --git a/apps/tools/serializers/tool.py b/apps/tools/serializers/tool.py index d5ebc665d..f8cbb94c7 100644 --- a/apps/tools/serializers/tool.py +++ b/apps/tools/serializers/tool.py @@ -17,7 +17,7 @@ from pylint.reporters import JSON2Reporter from rest_framework import serializers, status from common.constants.cache_version import Cache_Version -from common.constants.permission_constants import ResourceAuthType, ResourcePermissionGroup +from common.constants.permission_constants import ResourceAuthType, ResourcePermissionGroup, ResourcePermission from common.database_model_manage.database_model_manage import DatabaseModelManage from common.db.search import page_search, native_page_search from common.exception.app_exception import AppApiException @@ -222,7 +222,7 @@ class ToolSerializer(serializers.Serializer): WorkspaceUserResourcePermission( target=tool_id, auth_target_type=AuthTargetType.TOOL, - permission_list=[ResourcePermissionGroup.VIEW, ResourcePermissionGroup.MANAGE], + permission_list=[ResourcePermission.VIEW, ResourcePermission.MANAGE], workspace_id=self.data.get('workspace_id'), user_id=self.data.get('user_id'), auth_type=ResourceAuthType.RESOURCE_PERMISSION_GROUP