114554395-clear_fields_modification

This commit is contained in:
Stas 2016-03-22 18:14:19 +02:00
parent ffb76c7372
commit 9e9d0a305a
6 changed files with 6 additions and 6 deletions

View file

@ -45,7 +45,7 @@ class Admin::AccountActivitiesController < AdminController
def set_default_dates def set_default_dates
params[:q] ||= {} 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") params[:q][:created_at_gteq] = Time.now.strftime("%Y-%m-%d")
end end

View file

@ -15,7 +15,7 @@ class Admin::EppLogsController < AdminController
def set_default_dates def set_default_dates
params[:q] ||= {} 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") params[:q][:created_at_gteq] = Time.now.strftime("%Y-%m-%d")
end end

View file

@ -15,7 +15,7 @@ class Admin::ReppLogsController < AdminController
def set_default_dates def set_default_dates
params[:q] ||= {} 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") params[:q][:created_at_gteq] = Time.now.strftime("%Y-%m-%d")
end end

View file

@ -91,4 +91,4 @@
:coffee :coffee
$(".js-reset-form").on "click", (e) -> $(".js-reset-form").on "click", (e) ->
e.preventDefault(); e.preventDefault();
window.location = "#{admin_account_activities_path}" window.location = "#{admin_account_activities_path(clear_fields: true)}"

View file

@ -72,4 +72,4 @@
:coffee :coffee
$(".js-reset-form").on "click", (e) -> $(".js-reset-form").on "click", (e) ->
e.preventDefault(); e.preventDefault();
window.location = "#{admin_epp_logs_path}" window.location = "#{admin_epp_logs_path(clear_fields: true)}"

View file

@ -71,4 +71,4 @@
:coffee :coffee
$(".js-reset-form").on "click", (e) -> $(".js-reset-form").on "click", (e) ->
e.preventDefault(); e.preventDefault();
window.location = "#{admin_repp_logs_path}" window.location = "#{admin_repp_logs_path(clear_fields: true)}"