diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-09 17:19:47 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-16 20:30:27 -0200 |
| commit | e644b8d683d7b9fa2c411fe65e1c828ba9908b57 (patch) | |
| tree | 3e443132e2259d9bc1c80b0fb304bfef7b1d3c20 | |
| parent | ecea127cd1e2ac382a71e03ebc16de44f762b2dd (diff) | |
| download | gitlab-ce-23573-sort-functionality-for-project-member.tar.gz | |
Fix query in Projects::ProjectMembersController to fetch members23573-sort-functionality-for-project-member
| -rw-r--r-- | app/controllers/projects/project_members_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index e4aba4b700e..3aec6f18e27 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -37,8 +37,8 @@ class Projects::ProjectMembersController < Projects::ApplicationController @group_links = @project.project_group_links.where(group_id: @project.invited_groups.search(params[:search]).select(:id)) end - wheres = ["id IN (#{@project_members.select(:id).to_sql})"] - wheres << "id IN (#{group_members.select(:id).to_sql})" if group_members + wheres = ["members.id IN (#{@project_members.select(:id).to_sql})"] + wheres << "members.id IN (#{group_members.select(:id).to_sql})" if group_members @project_members = Member. where(wheres.join(' OR ')). |