lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-210: Add ability to search by role (#659)

Browse Source 
* Add ability to search by role

* Fix role search to work with select
This commit is contained in:
shawn-higgins1
2019-07-23 14:57:01 -04:00
committed by Jesus Federico
parent 68eb67752c
commit 81aea827ba
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/admins_controller.rb
View File

@ -206,15 +206,13 @@ class AdminsController < ApplicationController
User.without_role(:super_admin).where.not(id: current_user.id).includes(:roles)
end
list = @role.present? ? initial_list.with_role(@role.to_sym) : initial_list
if Rails.configuration.loadbalanced_configuration
list.where(provider: user_settings_provider)
.admins_search(@search)
.admins_order(@order_column, @order_direction)
initial_list.where(provider: user_settings_provider)
.admins_search(@search, @role)
.admins_order(@order_column, @order_direction)
else
list.admins_search(@search)
.admins_order(@order_column, @order_direction)
initial_list.admins_search(@search, @role)
.admins_order(@order_column, @order_direction)
end
end