Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion app/controllers/members_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def members_table_options(roles)
end

def members_filter_options(roles)
groups = Group.all.sort
groups = Group.visible.sort
shares = WorkPackageRole.all
status = Members::UserFilterComponent.status_param(params)

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class UsersController < ApplicationController
include PaginationHelper

def index
@groups = Group.all.sort
@groups = Group.visible.sort
@status = Users::UserFilterComponent.status_param params
@users = Users::UserFilterComponent.filter params
end
Expand Down
2 changes: 1 addition & 1 deletion app/models/queries/work_packages/filter/group_filter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@ def user_ids_for_filtering
end

def all_groups
@all_groups ||= ::Group.all
@all_groups ||= ::Group.visible
end
end
20 changes: 20 additions & 0 deletions spec/controllers/members_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,26 @@
end
end

describe "#index" do
let(:role) { create(:project_role, permissions: [:manage_members]) }
let!(:member) { create(:member, project:, user:, roles: [role]) }

let!(:visible_group) { create(:group, members: [user]) }
let!(:hidden_group) { create(:group) }

before { login_as(user) }

it "only includes groups the user is a member of in the filter options" do
get :index, params: { project_id: project.id }

expect(response).to be_successful

groups = assigns(:members_filter_options)[:groups]
expect(groups).to include(visible_group)
expect(groups).not_to include(hidden_group)
end
end

describe "#create with reduced visibility" do
let(:project_permissions) { %i[manage_members invite_members_by_email] }
let!(:other_project) { create(:project) }
Expand Down
4 changes: 2 additions & 2 deletions spec/models/queries/work_packages/filter/group_filter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
describe "#allowed_values" do
before do
allow(Group)
.to receive(:all)
.to receive(:visible)
.and_return [group]
end

Expand All @@ -81,7 +81,7 @@

before do
allow(Group)
.to receive(:all)
.to receive(:visible)
.and_return([group, group2])

instance.values = [group2.id.to_s]
Expand Down
2 changes: 1 addition & 1 deletion spec/views/users/index.html.erb_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

assign(:users, User.where(id: [admin.id, user.id]))
assign(:status, "all")
assign(:groups, Group.all)
assign(:groups, Group.visible)

without_partial_double_verification do
allow(view).to receive_messages(current_user: admin, controller_name: "users", action_name: "index")
Expand Down
Loading