zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-22 10:45:58 +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-24 17:37:17 +02:00
commit 913ac1f374
7 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/admin/account_activities_controller.rb
View file

@ -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

10
app/controllers/admin/epp_logs_controller.rb
View file

@ -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

11
app/controllers/admin/repp_logs_controller.rb
View file

@ -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