From e44c0c33d1e151deae9557c6486cbebd64f758ce Mon Sep 17 00:00:00 2001 From: zhangzhanwei Date: Wed, 29 Oct 2025 18:30:13 +0800 Subject: [PATCH] fix: Common user folder permission --- .../impl/base_variable_aggregation_node.py | 6 +++--- apps/folders/views/folder.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/application/flow/step_node/variable_aggregation_node/impl/base_variable_aggregation_node.py b/apps/application/flow/step_node/variable_aggregation_node/impl/base_variable_aggregation_node.py index c3ce785a61b..c65dc44dc3d 100644 --- a/apps/application/flow/step_node/variable_aggregation_node/impl/base_variable_aggregation_node.py +++ b/apps/application/flow/step_node/variable_aggregation_node/impl/base_variable_aggregation_node.py @@ -25,15 +25,15 @@ def get_first_non_null(self, variable_list): v = self.workflow_manage.get_reference_field( variable.get('variable')[0], variable.get('variable')[1:]) - if v is not None and not(isinstance(v, (str,list,dict)) and len(v) == 0) : + if v is not None and not (isinstance(v, (str, list, dict)) and len(v) == 0): return v return None def set_variable_to_json(self, variable_list): - return {variable.get('variable')[1:][0]: self.workflow_manage.get_reference_field( + return [self.workflow_manage.get_reference_field( variable.get('variable')[0], - variable.get('variable')[1:]) for variable in variable_list} + variable.get('variable')[1:]) for variable in variable_list] def reset_variable(self, variable): value = self.workflow_manage.get_reference_field( diff --git a/apps/folders/views/folder.py b/apps/folders/views/folder.py index f4db613efc5..443784fa615 100644 --- a/apps/folders/views/folder.py +++ b/apps/folders/views/folder.py @@ -45,7 +45,7 @@ class FolderView(APIView): ), lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()], [Permission(group=Group(f"{kwargs.get('source')}_FOLDER"), - operate=Operate.SELF, + operate=Operate.EDIT, resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{r.data.get('parent_id')}" )], CompareConstants.AND), RoleConstants.WORKSPACE_MANAGE.get_workspace_role() @@ -107,7 +107,7 @@ class Operate(APIView): ), lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()], [Permission(group=Group(f"{kwargs.get('source')}_FOLDER"), - operate=Operate.SELF, + operate=Operate.EDIT, resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{kwargs.get('folder_id')}" )], CompareConstants.AND), RoleConstants.WORKSPACE_MANAGE.get_workspace_role() @@ -159,7 +159,7 @@ def get(self, request: Request, workspace_id: str, source: str, folder_id: str): ), lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()], [Permission(group=Group(f"{kwargs.get('source')}_FOLDER"), - operate=Operate.SELF, + operate=Operate.EDIT, resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{kwargs.get('folder_id')}" )], CompareConstants.AND), RoleConstants.WORKSPACE_MANAGE.get_workspace_role()