panyy
/
UnisKB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Common user folder permission

v3.2
zhangzhanwei 2025-10-29 18:30:13 +08:00 committed by zhanweizhang7
parent 3c7e5ff3b6
commit c86306a67e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/application/flow/step_node/variable_aggregation_node/impl/base_variable_aggregation_node.py
View File

@ -25,15 +25,15 @@ class BaseVariableAggregationNode(IVariableAggregation):
v = self.workflow_manage.get_reference_field( v = self.workflow_manage.get_reference_field(
variable.get('variable')[0], variable.get('variable')[0],
variable.get('variable')[1:]) 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 v
return None return None
def set_variable_to_json(self, variable_list): 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')[0],
variable.get('variable')[1:]) for variable in variable_list} variable.get('variable')[1:]) for variable in variable_list]
def reset_variable(self, variable): def reset_variable(self, variable):
value = self.workflow_manage.get_reference_field( value = self.workflow_manage.get_reference_field(

6
apps/folders/views/folder.py
View File

@ -45,7 +45,7 @@ class FolderView(APIView):
), ),
lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()], lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()],
[Permission(group=Group(f"{kwargs.get('source')}_FOLDER"), [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')}" resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{r.data.get('parent_id')}"
)], CompareConstants.AND), )], CompareConstants.AND),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role() RoleConstants.WORKSPACE_MANAGE.get_workspace_role()
@ -107,7 +107,7 @@ class FolderView(APIView):
), ),
lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()], lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()],
[Permission(group=Group(f"{kwargs.get('source')}_FOLDER"), [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')}" resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{kwargs.get('folder_id')}"
)], CompareConstants.AND), )], CompareConstants.AND),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role() RoleConstants.WORKSPACE_MANAGE.get_workspace_role()
@ -159,7 +159,7 @@ class FolderView(APIView):
), ),
lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()], lambda r, kwargs: ViewPermission([RoleConstants.USER.get_workspace_role()],
[Permission(group=Group(f"{kwargs.get('source')}_FOLDER"), [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')}" resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('source')}/{kwargs.get('folder_id')}"
)], CompareConstants.AND), )], CompareConstants.AND),
RoleConstants.WORKSPACE_MANAGE.get_workspace_role() RoleConstants.WORKSPACE_MANAGE.get_workspace_role()