From f8530580100f56fe3bef5f3a73d3e543b038f98f Mon Sep 17 00:00:00 2001 From: Yar Date: Tue, 25 Oct 2016 20:14:58 +0300 Subject: Allow to search for user by secondary email address in the admin interface It is not possible to search for a user by his secondary email address in the Users search bar in the admin interface(/admin/users). A use-case could be that an admin wants to remove a specific secondary email address of an user, because it interferes with another user. Issue #23761 This commit adds ability to search not only by main email, but also by any secondary email in the admin interface. --- app/controllers/admin/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/admin/users_controller.rb') diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 57efa899694..bb912ed10cc 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -3,7 +3,7 @@ class Admin::UsersController < Admin::ApplicationController def index @users = User.order_name_asc.filter(params[:filter]) - @users = @users.search(params[:search_query]) if params[:search_query].present? + @users = @users.search_with_secondary_emails(params[:search_query]) if params[:search_query].present? @users = @users.sort(@sort = params[:sort]) @users = @users.page(params[:page]) end -- cgit v1.2.1