diff --git a/app/controllers/admin/account_activities_controller.rb b/app/controllers/admin/account_activities_controller.rb index 9357d7067..4a4fe2307 100644 --- a/app/controllers/admin/account_activities_controller.rb +++ b/app/controllers/admin/account_activities_controller.rb @@ -45,8 +45,15 @@ class Admin::AccountActivitiesController < AdminController def set_default_dates params[:q] ||= {} - 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") + if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? && params[:created_after].present? + + default_date = params[:created_after] + + if !['today', 'tomorrow', 'yesterday'].include?(default_date) + default_date = 'today' + end + + params[:q][:created_at_gteq] = Date.send(default_date).strftime("%Y-%m-%d") end end diff --git a/app/controllers/admin/epp_logs_controller.rb b/app/controllers/admin/epp_logs_controller.rb index fdefb0a1d..b14a99766 100644 --- a/app/controllers/admin/epp_logs_controller.rb +++ b/app/controllers/admin/epp_logs_controller.rb @@ -15,8 +15,14 @@ class Admin::EppLogsController < AdminController def set_default_dates params[:q] ||= {} - 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") + if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? && params[:created_after].present? + default_date = params[:created_after] + + if !['today', 'tomorrow', 'yesterday'].include?(default_date) + default_date = 'today' + end + + params[:q][:created_at_gteq] = Date.send(default_date).strftime("%Y-%m-%d") end end diff --git a/app/controllers/admin/repp_logs_controller.rb b/app/controllers/admin/repp_logs_controller.rb index 989db165b..8e904007a 100644 --- a/app/controllers/admin/repp_logs_controller.rb +++ b/app/controllers/admin/repp_logs_controller.rb @@ -15,8 +15,15 @@ class Admin::ReppLogsController < AdminController def set_default_dates params[:q] ||= {} - 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") + if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? && params[:created_after].present? + + default_date = params[:created_after] + + if !['today', 'tomorrow', 'yesterday'].include?(default_date) + default_date = 'today' + end + + params[:q][:created_at_gteq] = Date.send(default_date).strftime("%Y-%m-%d") end end diff --git a/app/views/admin/account_activities/index.haml b/app/views/admin/account_activities/index.haml index d79a64d5d..e29f12f75 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(clear_fields: true)}" + window.location = "#{admin_account_activities_path}" diff --git a/app/views/admin/epp_logs/index.haml b/app/views/admin/epp_logs/index.haml index 4e1f9501e..550a20014 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(clear_fields: true)}" + window.location = "#{admin_epp_logs_path}" diff --git a/app/views/admin/repp_logs/index.haml b/app/views/admin/repp_logs/index.haml index 00f90602b..49c74405b 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(clear_fields: true)}" + window.location = "#{admin_repp_logs_path}" diff --git a/app/views/layouts/admin/application.haml b/app/views/layouts/admin/application.haml index 6e3257740..53a73520c 100644 --- a/app/views/layouts/admin/application.haml +++ b/app/views/layouts/admin/application.haml @@ -55,7 +55,7 @@ %li= link_to t(:pricelists), admin_pricelists_path %li= link_to t(:bank_statements), admin_bank_statements_path %li= link_to t(:invoices), admin_invoices_path - %li= link_to t(:account_activities), admin_account_activities_path + %li= link_to t(:account_activities), admin_account_activities_path(created_after: 'today') %li.divider %li.dropdown-header= t(:system) %li= link_to t(:settings), admin_settings_path @@ -64,8 +64,8 @@ %li= link_to t(:reserved_domains), admin_reserved_domains_path %li= link_to t(:mail_templates), admin_mail_templates_path -# %li= link_to t(:domains_history), admin_domain_versions_path - %li= link_to t(:epp_logs), admin_epp_logs_path - %li= link_to t(:repp_logs), admin_repp_logs_path + %li= link_to t(:epp_logs), admin_epp_logs_path(created_after: 'today') + %li= link_to t(:repp_logs), admin_repp_logs_path(created_after: 'today') %li= link_to t(:que), '/admin/que' - if signed_in?