diff --git a/app/controllers/admins/user_actions_controller.rb b/app/controllers/admins/user_actions_controller.rb index ed542bb42..60de7d1ec 100644 --- a/app/controllers/admins/user_actions_controller.rb +++ b/app/controllers/admins/user_actions_controller.rb @@ -9,7 +9,7 @@ class Admins::UserActionsController < Admins::BaseController end keyword = params[:keyword].to_s.strip.presence if keyword - sql = 'users.login LIKE :keyword OR users.phone LIKE :keyword OR users.mail LIKE :keyword' + sql = 'users.login LIKE :keyword OR users.phone LIKE :keyword OR users.mail LIKE :keyword OR user_actions.login LIKE :keyword OR user_actions.phone LIKE :keyword OR user_actions.email LIKE :keyword' @user_actions = @user_actions.joins(:user).where(sql, keyword: "%#{keyword}%") end @user_actions = paginate @user_actions @@ -24,7 +24,7 @@ class Admins::UserActionsController < Admins::BaseController end keyword = params[:keyword].to_s.strip.presence if keyword - sql = 'users.login LIKE :keyword OR users.phone LIKE :keyword OR users.mail LIKE :keyword' + sql = 'users.login LIKE :keyword OR users.phone LIKE :keyword OR users.mail LIKE :keyword OR user_actions.login LIKE :keyword OR user_actions.phone LIKE :keyword OR user_actions.email LIKE :keyword' @user_actions = @user_actions.joins(:user).where(sql, keyword: "%#{keyword}%") end @user_actions = paginate @user_actions