diff options
Diffstat (limited to 'app/helpers/groups/group_members_helper.rb')
-rw-r--r-- | app/helpers/groups/group_members_helper.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/app/helpers/groups/group_members_helper.rb b/app/helpers/groups/group_members_helper.rb index 79191616c8f..c4d920dc317 100644 --- a/app/helpers/groups/group_members_helper.rb +++ b/app/helpers/groups/group_members_helper.rb @@ -13,12 +13,15 @@ module Groups::GroupMembersHelper render 'shared/members/invite_member', submit_url: group_group_members_path(group), access_levels: group.access_level_roles, default_access_level: default_access_level end - def group_members_list_data_json(group, members, pagination = {}) - group_members_list_data(group, members, pagination).to_json - end - - def group_group_links_list_data_json(group) - group_group_links_list_data(group).to_json + def group_members_app_data_json(group, members:, invited:, access_requests:) + { + user: group_members_list_data(group, members, { param_name: :page, params: { invited_members_page: nil, search_invited: nil } }), + group: group_group_links_list_data(group), + invite: group_members_list_data(group, invited.nil? ? [] : invited, { param_name: :invited_members_page, params: { page: nil } }), + access_request: group_members_list_data(group, access_requests.nil? ? [] : access_requests), + source_id: group.id, + can_manage_members: can?(current_user, :admin_group_member, group) + }.to_json end private @@ -32,13 +35,11 @@ module Groups::GroupMembersHelper end # Overridden in `ee/app/helpers/ee/groups/group_members_helper.rb` - def group_members_list_data(group, members, pagination) + def group_members_list_data(group, members, pagination = {}) { members: group_members_serialized(group, members), pagination: members_pagination_data(members, pagination), - member_path: group_group_member_path(group, ':id'), - source_id: group.id, - can_manage_members: can?(current_user, :admin_group_member, group) + member_path: group_group_member_path(group, ':id') } end @@ -48,8 +49,7 @@ module Groups::GroupMembersHelper { members: group_group_links_serialized(group_links), pagination: members_pagination_data(group_links), - member_path: group_group_link_path(group, ':id'), - source_id: group.id + member_path: group_group_link_path(group, ':id') } end end |