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

fix: Resource automatic authorization type error (#3505)

Browse Source
This commit is contained in:
shaohuzhang1 2025-07-08 10:56:24 +08:00 committed by GitHub
parent b40c76d3f3
commit 1c364c22cf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/system_manage/serializers/user_resource_permission.py
View File

@ -26,6 +26,7 @@ from common.utils.common import get_file_content
from common.utils.split_model import group_by from common.utils.split_model import group_by
from knowledge.models import Knowledge from knowledge.models import Knowledge
from maxkb.conf import PROJECT_DIR from maxkb.conf import PROJECT_DIR
from maxkb.settings import edition
from models_provider.models import Model from models_provider.models import Model
from system_manage.models import WorkspaceUserResourcePermission, AuthTargetType from system_manage.models import WorkspaceUserResourcePermission, AuthTargetType
from tools.models import Tool from tools.models import Tool
@ -109,13 +110,14 @@ class UserResourcePermissionSerializer(serializers.Serializer):
user_id = self.data.get('user_id') user_id = self.data.get('user_id')
wurp = QuerySet(WorkspaceUserResourcePermission).filter(auth_target_type=auth_target_type, wurp = QuerySet(WorkspaceUserResourcePermission).filter(auth_target_type=auth_target_type,
workspace_id=workspace_id).first() workspace_id=workspace_id).first()
auth_type = wurp.auth_type if wurp else ResourceAuthType.RESOURCE_PERMISSION_GROUP auth_type = wurp.auth_type if wurp else (
ResourceAuthType.RESOURCE_PERMISSION_GROUP if edition == 'CE' else ResourceAuthType.ROLE)
# 自动授权给创建者 # 自动授权给创建者
WorkspaceUserResourcePermission( WorkspaceUserResourcePermission(
target=resource_id, target=resource_id,
auth_target_type=auth_target_type, auth_target_type=auth_target_type,
permission_list=[ResourcePermission.VIEW, permission_list=[ResourcePermission.VIEW,
ResourcePermission.MANAGE] if auth_type == ResourceAuthType.RESOURCE_PERMISSION_GROUP else [ ResourcePermission.MANAGE] if auth_type == ResourceAuthType.RESOURCE_PERMISSION_GROUP else [
ResourcePermissionRole.ROLE], ResourcePermissionRole.ROLE],
workspace_id=workspace_id, workspace_id=workspace_id,
user_id=user_id, user_id=user_id,