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

Merge pull request #8731 from aignatov-bio/ai-sci-12151-fix-users-group-permission-for-list-users

Browse source 
Fix users group permission for list of users [SCI-12151]
This commit is contained in:
aignatov-bio 2025-07-31 13:55:47 +02:00 • committed by GitHub
commit ad4729a7d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/users/settings/user_groups_controller.rb
View file

@ -7,8 +7,8 @@ module Users
before_action :set_breadcrumbs_items, only: %i(index show)
before_action :check_user_groups_enabled
before_action :load_user_group, except: %i(index unassigned_users actions_toolbar create)
before_action :check_read_permissions, only: %i(users)
before_action :check_manage_permissions, except: %i(index show unassigned_users actions_toolbar)
before_action :check_read_permissions, only: %i(index show unassigned_users actions_toolbar users)
before_action :check_manage_permissions, except: %i(index show unassigned_users actions_toolbar users)
def index
respond_to do |format|

4
app/serializers/lists/experiment_serializer.rb
View file

@ -78,12 +78,12 @@ module Lists
workflow_img: fetch_workflow_img_experiment_path(object),
favorite: favorite_experiment_url(object),
unfavorite: unfavorite_experiment_url(object),
user_roles: user_roles_access_permissions_experiment_path(object)
user_roles: user_roles_access_permissions_experiment_path(object),
user_group_members: users_users_settings_team_user_groups_path(team_id: object.team.id)
}
if can_manage_project_users?(object.project)
urls_list[:update_access] = access_permissions_experiment_path(object)
urls_list[:user_group_members] = users_users_settings_team_user_groups_path(team_id: object.team.id)
end
urls_list
end

4
app/serializers/lists/form_serializer.rb
View file

@ -68,7 +68,8 @@ module Lists
urls_list = {
show_access: access_permissions_form_path(object),
show_user_group_assignments_access: show_user_group_assignments_access_permissions_form_path(object),
user_roles: user_roles_access_permissions_form_path(object)
user_roles: user_roles_access_permissions_form_path(object),
user_group_members: users_users_settings_team_user_groups_path(team_id: object.team.id)
}
urls_list[:show] = form_path(object) if can_read_form?(object)
@ -78,7 +79,6 @@ module Lists
urls_list[:new_access] = new_access_permissions_form_path(id: object.id)
urls_list[:create_access] = access_permissions_forms_path(id: object.id)
urls_list[:unassigned_user_groups] = unassigned_user_groups_access_permissions_form_path(id: object.id)
urls_list[:user_group_members] = users_users_settings_team_user_groups_path(team_id: object.team.id)
end
urls_list

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

@ -162,13 +162,13 @@ module Lists
urls_list[:show_access] = access_permissions_project_path(object)
urls_list[:show_user_group_assignments_access] = show_user_group_assignments_access_permissions_project_path(object)
urls_list[:user_group_members] = users_users_settings_team_user_groups_path(team_id: object.team.id)
if project? && users_managable?
urls_list[:assigned_users] = assigned_users_list_project_path(object)
urls_list[:update_access] = access_permissions_project_path(object)
urls_list[:new_access] = new_access_permissions_project_path(id: object.id)
urls_list[:unassigned_user_groups] = unassigned_user_groups_access_permissions_project_path(id: object.id)
urls_list[:create_access] = access_permissions_projects_path(id: object.id)
urls_list[:user_group_members] = users_users_settings_team_user_groups_path(team_id: object.team.id)
end
urls_list

4
app/serializers/lists/protocol_serializer.rb
View file

@ -101,7 +101,8 @@ module Lists
linked_my_modules: linked_children_protocol_path(object.parent || object),
versions_modal: versions_modal_protocol_path(object.parent || object),
show_user_group_assignments_access: show_user_group_assignments_access_permissions_protocol_path(object),
user_roles: user_roles_access_permissions_protocol_path(object)
user_roles: user_roles_access_permissions_protocol_path(object),
user_group_members: users_users_settings_team_user_groups_path(team_id: object.team.id)
}
if can_read_protocol_in_repository?(object)
@ -122,7 +123,6 @@ module Lists
urls_list[:new_access] = new_access_permissions_protocol_path(id: object.id)
urls_list[:create_access] = access_permissions_protocols_path(id: object.id)
urls_list[:unassigned_user_groups] = unassigned_user_groups_access_permissions_protocol_path(id: object.id)
urls_list[:user_group_members] = users_users_settings_team_user_groups_path(team_id: object.team.id)
end
urls_list

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

@ -73,7 +73,8 @@ 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_roles: user_roles_access_permissions_repository_path(object),
user_group_members: users_users_settings_team_user_groups_path(team_id: object.team.id)
}
if can_manage_repository_users?(object)
@ -81,7 +82,6 @@ module Lists
urls[:new_access] = new_access_permissions_repository_path(id: object.id)
urls[:create_access] = access_permissions_repositories_path(id: object.id)
urls[:unassigned_user_groups] = unassigned_user_groups_access_permissions_project_path(id: object.id)
urls[:user_group_members] = users_users_settings_team_user_groups_path(team_id: object.team.id)
urls[:show_user_group_assignments_access] = show_user_group_assignments_access_permissions_repository_path(object)
end