Skip to content
Snippets Groups Projects

FE for share groups with groups

Merged Imre Farkas requested to merge if-share_groups_with_groups_fe into master
All threads resolved!
3 files
+ 38
10
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -19,18 +19,23 @@ def self.admin_not_required_endpoints
:approve_access_request, :leave, :resend_invite,
:override
# rubocop: disable CodeReuse/ActiveRecord
def index
@sort = params[:sort].presence || sort_value_name
@project = @group.projects.find(params[:project_id]) if params[:project_id]
@members = find_members
if can_manage_members
@skip_groups = skip_group_ids
@skip_groups = @group.related_group_ids
@invited_members = members.invite
@invited_members = @invited_members.search_invite_email(params[:search_invited]) if params[:search_invited].present?
@invited_members = present_members(@invited_members.page(params[:invited_members_page]).per(MEMBER_PER_PAGE_LIMIT))
if params[:search_invited].present?
@invited_members = @invited_members.search_invite_email(params[:search_invited])
end
@invited_members = present_members(
@invited_members.page(params[:invited_members_page])
.per(MEMBER_PER_PAGE_LIMIT))
end
@members = present_group_members(members)
@@ -54,12 +59,6 @@ def can_manage_members
can?(current_user, :admin_group_member, @group)
end
def skip_group_ids
result = @group.shared_with_group_links.pluck(:shared_group_id)
result << @group.id
result + @group.ancestors.pluck(:id)
end
def present_group_members(original_members)
members = original_members.non_invite
members = members.search(params[:search]) if params[:search].present?
Loading