Merge branch '114554395-log_limits' into staging

This commit is contained in:
Stas 2016-03-22 18:15:01 +02:00
commit 81c4106468
6 changed files with 6 additions and 6 deletions

View file

@ -45,7 +45,7 @@ class Admin::AccountActivitiesController < AdminController
def set_default_dates
params[:q] ||= {}
if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil?
if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? && params[:clear_fields].nil?
params[:q][:created_at_gteq] = Time.now.strftime("%Y-%m-%d")
end

View file

@ -15,7 +15,7 @@ class Admin::EppLogsController < AdminController
def set_default_dates
params[:q] ||= {}
if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil?
if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? && params[:clear_fields].nil?
params[:q][:created_at_gteq] = Time.now.strftime("%Y-%m-%d")
end

View file

@ -15,7 +15,7 @@ class Admin::ReppLogsController < AdminController
def set_default_dates
params[:q] ||= {}
if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil?
if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? && params[:clear_fields].nil?
params[:q][:created_at_gteq] = Time.now.strftime("%Y-%m-%d")
end