fix: Folder authorization of common user
--bug=1062968 --user=张展玮 【应用】普通用户对自己管理的文件夹进行资源授权,生效资源选择所有子资源,授权报错 https://www.tapd.cn/62980211/s/1790231v3.2
parent
9a46cac406
commit
1174ee11c6
|
|
@ -409,13 +409,13 @@ class ResourceUserPermissionSerializer(serializers.Serializer):
|
||||||
if workspace_manage:
|
if workspace_manage:
|
||||||
current_user_managed_resources_ids = QuerySet(resource_model).filter(workspace_id=workspace_id, folder__in=folder_ids).annotate(
|
current_user_managed_resources_ids = QuerySet(resource_model).filter(workspace_id=workspace_id, folder__in=folder_ids).annotate(
|
||||||
id_str=Cast('id', TextField())
|
id_str=Cast('id', TextField())
|
||||||
).values_list("id", flat=True)
|
).values_list("id_str", flat=True)
|
||||||
else:
|
else:
|
||||||
current_user_managed_resources_ids = QuerySet(WorkspaceUserResourcePermission).filter(
|
current_user_managed_resources_ids = QuerySet(WorkspaceUserResourcePermission).filter(
|
||||||
workspace_id=workspace_id, user_id=current_user_id, auth_target_type=auth_target_type,
|
workspace_id=workspace_id, user_id=current_user_id, auth_target_type=auth_target_type,
|
||||||
target__in=QuerySet(resource_model).filter(workspace_id=workspace_id, folder__in=folder_ids).annotate(
|
target__in=QuerySet(resource_model).filter(workspace_id=workspace_id, folder__in=folder_ids).annotate(
|
||||||
id_str=Cast('id', TextField())
|
id_str=Cast('id', TextField())
|
||||||
).values_list("id", flat=True),
|
).values_list("id_str", flat=True),
|
||||||
permission_list__contains=['MANAGE']).values_list('target', flat=True)
|
permission_list__contains=['MANAGE']).values_list('target', flat=True)
|
||||||
|
|
||||||
return current_user_managed_resources_ids
|
return current_user_managed_resources_ids
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue