Skip to content

Commit cc692ff

Browse files
committed
feat: update permission constants to include ResourcePermission
--bug=1057659 --user=刘瑞斌 【共享资源】企业版-创建共享工具失败 https://www.tapd.cn/62980211/s/1720006
1 parent a66cdc0 commit cc692ff

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

apps/knowledge/serializers/knowledge.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from application.models import ApplicationKnowledgeMapping
2323
from common.config.embedding_config import VectorStore
2424
from common.constants.cache_version import Cache_Version
25-
from common.constants.permission_constants import ResourceAuthType, ResourcePermissionGroup
25+
from common.constants.permission_constants import ResourceAuthType, ResourcePermissionGroup, ResourcePermission
2626
from common.database_model_manage.database_model_manage import DatabaseModelManage
2727
from common.db.search import native_search, get_dynamics_model, native_page_search
2828
from common.db.sql_execute import select_list
@@ -536,7 +536,7 @@ def save_base(self, instance, with_valid=True):
536536
WorkspaceUserResourcePermission(
537537
target=knowledge_id,
538538
auth_target_type=AuthTargetType.KNOWLEDGE,
539-
permission_list=[ResourcePermissionGroup.VIEW, ResourcePermissionGroup.MANAGE],
539+
permission_list=[ResourcePermission.VIEW, ResourcePermission.MANAGE],
540540
workspace_id=self.data.get('workspace_id'),
541541
user_id=self.data.get('user_id'),
542542
auth_type=ResourceAuthType.RESOURCE_PERMISSION_GROUP
@@ -587,7 +587,7 @@ def save_web(self, instance: Dict, with_valid=True):
587587
WorkspaceUserResourcePermission(
588588
target=knowledge_id,
589589
auth_target_type=AuthTargetType.KNOWLEDGE,
590-
permission_list=[ResourcePermissionGroup.VIEW, ResourcePermissionGroup.MANAGE],
590+
permission_list=[ResourcePermission.VIEW, ResourcePermission.MANAGE],
591591
workspace_id=self.data.get('workspace_id'),
592592
user_id=self.data.get('user_id'),
593593
auth_type=ResourceAuthType.RESOURCE_PERMISSION_GROUP

apps/tools/serializers/tool.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from rest_framework import serializers, status
1818

1919
from common.constants.cache_version import Cache_Version
20-
from common.constants.permission_constants import ResourceAuthType, ResourcePermissionGroup
20+
from common.constants.permission_constants import ResourceAuthType, ResourcePermissionGroup, ResourcePermission
2121
from common.database_model_manage.database_model_manage import DatabaseModelManage
2222
from common.db.search import page_search, native_page_search
2323
from common.exception.app_exception import AppApiException
@@ -222,7 +222,7 @@ def insert(self, instance, with_valid=True):
222222
WorkspaceUserResourcePermission(
223223
target=tool_id,
224224
auth_target_type=AuthTargetType.TOOL,
225-
permission_list=[ResourcePermissionGroup.VIEW, ResourcePermissionGroup.MANAGE],
225+
permission_list=[ResourcePermission.VIEW, ResourcePermission.MANAGE],
226226
workspace_id=self.data.get('workspace_id'),
227227
user_id=self.data.get('user_id'),
228228
auth_type=ResourceAuthType.RESOURCE_PERMISSION_GROUP

0 commit comments

Comments
 (0)