diff --git a/app/controllers/admin/epp_logs_controller.rb b/app/controllers/admin/epp_logs_controller.rb index c67f0b562..021c90379 100644 --- a/app/controllers/admin/epp_logs_controller.rb +++ b/app/controllers/admin/epp_logs_controller.rb @@ -29,14 +29,19 @@ module Admin def set_default_dates params[:q] ||= {} - - return unless params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? && - params[:created_after].present? + return unless default_dates? default_date = params[:created_after] default_date = 'today' unless %w[today tomorrow yesterday].include?(default_date) params[:q][:created_at_gteq] = Date.send(default_date).strftime("%Y-%m-%d") end + + private + + def default_dates? + params[:q] ||= {} + params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? && params[:created_after].present? + end end end diff --git a/app/controllers/admin/repp_logs_controller.rb b/app/controllers/admin/repp_logs_controller.rb index 9bc676ac1..add77b1d2 100644 --- a/app/controllers/admin/repp_logs_controller.rb +++ b/app/controllers/admin/repp_logs_controller.rb @@ -1,7 +1,7 @@ module Admin class ReppLogsController < BaseController load_and_authorize_resource class: ApiLog::ReppLog - before_action :set_default_dates, only: [:index] + before_action :set_default_dates, only: [:index], if: -> { params[:q].to_i == current_user.id } # rubocop:disable Metrics/MethodLength def index @@ -31,14 +31,19 @@ module Admin def set_default_dates params[:q] ||= {} - - return unless params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? && - params[:created_after].present? + return unless default_dates? default_date = params[:created_after] default_date = 'today' unless %w[today tomorrow yesterday].include?(default_date) params[:q][:created_at_gteq] = Date.send(default_date).strftime("%Y-%m-%d") end + + private + + def default_dates? + params[:q] ||= {} + params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? && params[:created_after].present? + end end end