diff options
Diffstat (limited to 'app/controllers/admin/users_controller.rb')
-rw-r--r-- | app/controllers/admin/users_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index d0761083c8b..8a090c8ef10 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -13,7 +13,7 @@ class Admin::UsersController < Admin::ApplicationController def index @users = User.filter_items(params[:filter]).order_name_asc @users = @users.search_with_secondary_emails(params[:search_query]) if params[:search_query].present? - @users = @users.includes(:authorized_projects) # rubocop: disable CodeReuse/ActiveRecord + @users = users_with_included_associations(@users) @users = @users.sort_by_attribute(@sort = params[:sort]) @users = @users.page(params[:page]) @@ -228,6 +228,10 @@ class Admin::UsersController < Admin::ApplicationController protected + def users_with_included_associations(users) + users.includes(:authorized_projects) # rubocop: disable CodeReuse/ActiveRecord + end + def admin_making_changes_for_another_user? user != current_user end |