From ffb76c7372af06330edabe928c90e2703b0a604e Mon Sep 17 00:00:00 2001 From: Stas Date: Mon, 21 Mar 2016 20:15:36 +0200 Subject: [PATCH 1/3] 114554395-start_date_added --- .../admin/account_activities_controller.rb | 11 ++++++++++- app/controllers/admin/epp_logs_controller.rb | 10 ++++++++++ app/controllers/admin/repp_logs_controller.rb | 10 ++++++++++ app/views/admin/epp_logs/index.haml | 4 ++-- app/views/admin/repp_logs/index.haml | 4 ++-- 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/account_activities_controller.rb b/app/controllers/admin/account_activities_controller.rb index 1e1bf9196..82bb021fe 100644 --- a/app/controllers/admin/account_activities_controller.rb +++ b/app/controllers/admin/account_activities_controller.rb @@ -1,8 +1,8 @@ class Admin::AccountActivitiesController < AdminController load_and_authorize_resource + before_action :set_default_dates, only: [:index] def index # rubocop: disable Metrics/AbcSize - params[:q] ||= {} ca_cache = params[:q][:created_at_lteq] begin @@ -41,4 +41,13 @@ class Admin::AccountActivitiesController < AdminController params[:q][:created_at_lteq] = ca_cache end + + def set_default_dates + params[:q] ||= {} + + if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? + params[:q][:created_at_gteq] = Time.now.strftime("%Y-%m-%d") + end + + end end diff --git a/app/controllers/admin/epp_logs_controller.rb b/app/controllers/admin/epp_logs_controller.rb index deb9ee8e7..3de64751d 100644 --- a/app/controllers/admin/epp_logs_controller.rb +++ b/app/controllers/admin/epp_logs_controller.rb @@ -1,5 +1,6 @@ class Admin::EppLogsController < AdminController load_and_authorize_resource class: ApiLog::EppLog + before_action :set_default_dates, only: [:index] def index @q = ApiLog::EppLog.search(params[:q]) @@ -10,4 +11,13 @@ class Admin::EppLogsController < AdminController def show @epp_log = ApiLog::EppLog.find(params[:id]) end + + def set_default_dates + params[:q] ||= {} + + if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? + params[:q][:created_at_gteq] = Time.now.strftime("%Y-%m-%d") + end + + end end diff --git a/app/controllers/admin/repp_logs_controller.rb b/app/controllers/admin/repp_logs_controller.rb index e9e35aac0..ab7942753 100644 --- a/app/controllers/admin/repp_logs_controller.rb +++ b/app/controllers/admin/repp_logs_controller.rb @@ -1,5 +1,6 @@ class Admin::ReppLogsController < AdminController load_and_authorize_resource class: ApiLog::ReppLog + before_action :set_default_dates, only: [:index] def index @q = ApiLog::ReppLog.search(params[:q]) @@ -10,4 +11,13 @@ class Admin::ReppLogsController < AdminController def show @repp_log = ApiLog::ReppLog.find(params[:id]) end + + def set_default_dates + params[:q] ||= {} + + if params[:q][:created_at_gteq].nil? && params[:q][:created_at_lteq].nil? + params[:q][:created_at_gteq] = Time.now.strftime("%Y-%m-%d") + end + + end end diff --git a/app/views/admin/epp_logs/index.haml b/app/views/admin/epp_logs/index.haml index fa2e64267..550a20014 100644 --- a/app/views/admin/epp_logs/index.haml +++ b/app/views/admin/epp_logs/index.haml @@ -29,11 +29,11 @@ .col-md-3 .form-group = f.label t(:created_after) - = f.search_field :created_at_gteq, class: 'form-control', placeholder: t(:created_after), autocomplete: 'off' + = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_after), autocomplete: 'off' .col-md-3 .form-group = f.label t(:created_before) - = f.search_field :created_at_lteq, class: 'form-control', placeholder: t(:created_before), autocomplete: 'off' + = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_before), autocomplete: 'off' .col-md-3{style: 'padding-top: 25px;'} %button.btn.btn-primary   diff --git a/app/views/admin/repp_logs/index.haml b/app/views/admin/repp_logs/index.haml index 0d33c4a6b..49c74405b 100644 --- a/app/views/admin/repp_logs/index.haml +++ b/app/views/admin/repp_logs/index.haml @@ -29,11 +29,11 @@ .col-md-3 .form-group = f.label t(:created_after) - = f.search_field :created_at_gteq, class: 'form-control', placeholder: t(:created_after), autocomplete: 'off' + = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_after), autocomplete: 'off' .col-md-3 .form-group = f.label t(:created_before) - = f.search_field :created_at_lteq, class: 'form-control', placeholder: t(:created_before), autocomplete: 'off' + = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_before), autocomplete: 'off' .col-md-3{style: 'padding-top: 25px;'} %button.btn.btn-primary   From 9e9d0a305aac47fc0896ac9f5801f45ec688f8a7 Mon Sep 17 00:00:00 2001 From: Stas Date: Tue, 22 Mar 2016 18:14:19 +0200 Subject: [PATCH 2/3] 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)}" From b73ef11cc31aee4dbbe63dab4caf3fa5a9586a7c Mon Sep 17 00:00:00 2001 From: Stas Date: Thu, 24 Mar 2016 14:43:21 +0200 Subject: [PATCH 3/3] 114554395-param_changes --- .../admin/account_activities_controller.rb | 11 +++++++++-- app/controllers/admin/epp_logs_controller.rb | 10 ++++++++-- app/controllers/admin/repp_logs_controller.rb | 11 +++++++++-- app/views/admin/account_activities/index.haml | 2 +- app/views/admin/epp_logs/index.haml | 2 +- app/views/admin/repp_logs/index.haml | 2 +- app/views/layouts/admin/application.haml | 6 +++--- 7 files changed, 32 insertions(+), 12 deletions(-) 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?