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

Fixed issue causing manage users to through 500 (#1778)

This commit is contained in:
Ahmad Farhat 2020-06-11 10:21:11 -04:00 committed by GitHub
parent 62da03b9dc
commit 39c31e759a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/concerns/populator.rb
View File

@ -23,7 +23,7 @@ module Populator
def manage_users_list
current_role = @role
initial_user = case @tab
initial_list = case @tab
when "active"
User.without_role([:pending, :denied])
when "deleted"
@ -34,7 +34,7 @@ module Populator
current_role = Role.find_by(name: @tab, provider: @user_domain) if @tab == "pending" || @tab == "denied"
initial_list = initial_user.without_role(:super_admin) unless current_user.has_role? :super_admin
initial_list = initial_list.without_role(:super_admin) unless current_user.has_role? :super_admin
initial_list = initial_list.where(provider: @user_domain) if Rails.configuration.loadbalanced_configuration