From 9e9d0a305aac47fc0896ac9f5801f45ec688f8a7 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 22 Mar 2016 18:14:19 +0200 Subject: [PATCH] 114554395-clear_fields_modification --- app/controllers/admin/account_activities_controller.rb | 2 +- app/controllers/admin/epp_logs_controller.rb | 2 +- app/controllers/admin/repp_logs_controller.rb | 2 +- app/views/admin/account_activities/index.haml | 2 +- app/views/admin/epp_logs/index.haml | 2 +- app/views/admin/repp_logs/index.haml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/account_activities_controller.rb b/app/controllers/admin/account_activities_controller.rb index 82bb021fe..9357d7067 100644 --- a/app/controllers/admin/account_activities_controller.rb +++ b/app/controllers/admin/account_activities_controller.rb @@ -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 diff --git a/app/controllers/admin/epp_logs_controller.rb b/app/controllers/admin/epp_logs_controller.rb index 3de64751d..fdefb0a1d 100644 --- a/app/controllers/admin/epp_logs_controller.rb +++ b/app/controllers/admin/epp_logs_controller.rb @@ -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 diff --git a/app/controllers/admin/repp_logs_controller.rb b/app/controllers/admin/repp_logs_controller.rb index ab7942753..989db165b 100644 --- a/app/controllers/admin/repp_logs_controller.rb +++ b/app/controllers/admin/repp_logs_controller.rb @@ -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 diff --git a/app/views/admin/account_activities/index.haml b/app/views/admin/account_activities/index.haml index e29f12f75..d79a64d5d 100644 --- a/app/views/admin/account_activities/index.haml +++ b/app/views/admin/account_activities/index.haml @@ -91,4 +91,4 @@ :coffee $(".js-reset-form").on "click", (e) -> e.preventDefault(); - window.location = "#{admin_account_activities_path}" + window.location = "#{admin_account_activities_path(clear_fields: true)}" diff --git a/app/views/admin/epp_logs/index.haml b/app/views/admin/epp_logs/index.haml index 550a20014..4e1f9501e 100644 --- a/app/views/admin/epp_logs/index.haml +++ b/app/views/admin/epp_logs/index.haml @@ -72,4 +72,4 @@ :coffee $(".js-reset-form").on "click", (e) -> e.preventDefault(); - window.location = "#{admin_epp_logs_path}" + window.location = "#{admin_epp_logs_path(clear_fields: true)}" diff --git a/app/views/admin/repp_logs/index.haml b/app/views/admin/repp_logs/index.haml index 49c74405b..00f90602b 100644 --- a/app/views/admin/repp_logs/index.haml +++ b/app/views/admin/repp_logs/index.haml @@ -71,4 +71,4 @@ :coffee $(".js-reset-form").on "click", (e) -> e.preventDefault(); - window.location = "#{admin_repp_logs_path}" + window.location = "#{admin_repp_logs_path(clear_fields: true)}"