Skip to content

Commit b6e2ace

Browse files
committed
fix: Grant folder permissions based on user roles to regular users error
1 parent d390d43 commit b6e2ace

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

apps/system_manage/views/user_resource_permission.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class WorkspaceResourceUserPermissionView(APIView):
122122
operate=Operate.AUTH,
123123
resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('resource').replace('_FOLDER','')}/{kwargs.get('target')}"),
124124
ViewPermission([RoleConstants.USER.get_workspace_role()],
125-
[lambda r, kwargs: Permission(group=Group(kwargs.get('resource')),
125+
[lambda r, kwargs: Permission(group=Group(kwargs.get('resource').replace('_FOLDER','')),
126126
operate=Operate.SELF,
127127
resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('resource').replace('_FOLDER','')}/{kwargs.get('target')}")],
128128
CompareConstants.AND),
@@ -156,7 +156,7 @@ def get(self, request: Request, workspace_id: str, target: str, resource: str):
156156
operate=Operate.AUTH,
157157
resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('resource').replace('_FOLDER','')}/{kwargs.get('target')}"),
158158
ViewPermission([RoleConstants.USER.get_workspace_role()],
159-
[lambda r, kwargs: Permission(group=Group(kwargs.get('resource')),
159+
[lambda r, kwargs: Permission(group=Group(kwargs.get('resource').replace('_FOLDER','')),
160160
operate=Operate.SELF,
161161
resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('resource').replace('_FOLDER','')}/{kwargs.get('target')}")],
162162
CompareConstants.AND),
@@ -186,7 +186,7 @@ class Page(APIView):
186186
operate=Operate.AUTH,
187187
resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('resource').replace('_FOLDER','')}/{kwargs.get('target')}"),
188188
ViewPermission([RoleConstants.USER.get_workspace_role()],
189-
[lambda r, kwargs: Permission(group=Group(kwargs.get('resource')),
189+
[lambda r, kwargs: Permission(group=Group(kwargs.get('resource').replace('_FOLDER','')),
190190
operate=Operate.SELF,
191191
resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}/{kwargs.get('resource').replace('_FOLDER','')}/{kwargs.get('target')}")],
192192
CompareConstants.AND),

0 commit comments

Comments
 (0)