Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/common/auth/handle/impl/user_token.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def get_permission_list(user,
def reset_workspace_role(role_id, workspace_id, role_dict):
if system_role_list.__contains__(role_id):
if system_role == role_id:
return role_id
return [role_id]
else:
return [f"{role_id}:/WORKSPACE/{workspace_id}", role_id]
else:
Expand All @@ -238,7 +238,7 @@ def reset_workspace_role(role_id, workspace_id, role_dict):
return ''
role_type = role_dict.get(role_id).type
if system_role == role_type:
return RoleConstants.EXTENDS_ADMIN.value.name
return [RoleConstants.EXTENDS_ADMIN.value.name]
return [f"EXTENDS_{role_type}:/WORKSPACE/{workspace_id}", f"EXTENDS_{role_type}"]


Expand Down
Loading