diff --git a/app/controllers/admins/user_actions_controller.rb b/app/controllers/admins/user_actions_controller.rb index 60de7d1ec..19ebec768 100644 --- a/app/controllers/admins/user_actions_controller.rb +++ b/app/controllers/admins/user_actions_controller.rb @@ -17,10 +17,12 @@ class Admins::UserActionsController < Admins::BaseController def index_1 @user_actions = UserAction.where(action_type: ["CompetitionInfoCreate", "CompetitionInfoUpdate", "CompetitionInfoUp", "CompetitionInfoDown", 'MemoPassed']).order(created_at: :desc) - if params[:action_type].present? && params[:action_type].include?("CompetitionInfo") - @user_actions = @user_actions.where(action_type: ["CompetitionInfoCreate", "CompetitionInfoUpdate", "CompetitionInfoUp", "CompetitionInfoDown"]) - else - @user_actions = @user_actions.where(action_type: params[:action_type]) + if params[:action_type].present? + if params[:action_type].include?("CompetitionInfo") + @user_actions = @user_actions.where(action_type: ["CompetitionInfoCreate", "CompetitionInfoUpdate", "CompetitionInfoUp", "CompetitionInfoDown"]) + else + @user_actions = @user_actions.where(action_type: params[:action_type]) + end end keyword = params[:keyword].to_s.strip.presence if keyword