zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-20 09:46:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '114554395-log_limits' into staging

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/account_activities_controller.rb
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

2
app/controllers/admin/epp_logs_controller.rb
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

2
app/controllers/admin/repp_logs_controller.rb
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

2
app/views/admin/account_activities/index.haml
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)}"

2
app/views/admin/epp_logs/index.haml
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)}"

2
app/views/admin/repp_logs/index.haml
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)}"