|
|
@@ -18,7 +18,8 @@ class Organizations::OrganizationUsersController < Organizations::BaseController |
|
|
|
|
|
|
|
|
organization_user_ids = @organization.organization_users.pluck(:user_id).uniq |
|
|
organization_user_ids = @organization.organization_users.pluck(:user_id).uniq |
|
|
project_member_user_ids = @organization.projects.joins(:members).pluck("members.user_id").uniq |
|
|
project_member_user_ids = @organization.projects.joins(:members).pluck("members.user_id").uniq |
|
|
users = User.where(id: organization_user_ids + project_member_user_ids) |
|
|
|
|
|
|
|
|
ids = organization_user_ids + project_member_user_ids |
|
|
|
|
|
users = User.where(id: ids).reorder(Arel.sql("FIELD(users.id,#{ids.join(',')})")) |
|
|
if params[:search].present? |
|
|
if params[:search].present? |
|
|
search = params[:search].to_s.downcase |
|
|
search = params[:search].to_s.downcase |
|
|
user_condition_users = User.like(search).to_sql |
|
|
user_condition_users = User.like(search).to_sql |
|
|
|