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

Refactored code to reduce number of database queries (#960)

Browse Source
This commit is contained in:
Ahmad Farhat
2020-02-24 12:31:30 -05:00
committed by GitHub
parent 92da1f6f87
commit 2cc1fdf281
14 changed files with 81 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,11 +25,11 @@ module Populator
initial_user = case @tab
when "active"
User.without_role(:pending).without_role(:denied)
User.includes(:roles).without_role(:pending).without_role(:denied)
when "deleted"
User.deleted
User.includes(:roles).deleted
else
User
User.includes(:roles)
end
current_role = Role.find_by(name: @tab, provider: @user_domain) if @tab == "pending" || @tab == "denied"
@ -57,7 +57,7 @@ module Populator
.admins_search(@search)
.admins_order(@order_column, @order_direction)
else
Room.all.admins_search(@search).admins_order(@order_column, @order_direction)
Room.includes(:owner).all.admins_search(@search).admins_order(@order_column, @order_direction)
end
end