scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-07 13:44:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8783 from artoscinote/ma_SCI_12249

Browse source 
Fix displaying user groups from other teams on shared repositories [SCI-12249]
This commit is contained in:
Martin Artnik 2025-08-13 11:20:49 +02:00 • committed by GitHub
commit b3145f9caa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/access_permissions/base_controller.rb
View file

@ -108,7 +108,7 @@ module AccessPermissions
end
def show_user_group_assignments
render json: @model.user_group_assignments.includes(:user_role, :user_group).order('user_groups.name ASC'),
render json: @model.user_group_assignments.where(team: current_team).includes(:user_role, :user_group).order('user_groups.name ASC'),
each_serializer: UserGroupAssignmentSerializer, user: current_user
end

2
app/serializers/lists/repository_serializer.rb
View file

@ -58,7 +58,7 @@ module Lists
show_access: access_permissions_repository_path(object),
share: team_shared_objects_path(current_user.current_team, object_id: object.id, object_type: 'Repository'),
user_roles: user_roles_access_permissions_repository_path(object),
user_group_members: users_users_settings_team_user_groups_path(team_id: object.team.id)
user_group_members: users_users_settings_team_user_groups_path(team_id: current_user.current_team_id)
}
urls[:show] = repository_path(object) if can_read?