Normalize dates before search #2122

This commit is contained in:
Martin Lensment 2015-07-30 12:32:01 +03:00
parent 6678e7c1a0
commit 31d19ff64e
2 changed files with 21 additions and 4 deletions

View file

@ -11,8 +11,11 @@ class Admin::DomainsController < AdminController
else
domains = Domain.includes(:registrar, :registrant)
end
@q = domains.search(params[:q])
@domains = @q.result.page(params[:page])
normalize_search_parameters do
@q = domains.search(params[:q])
@domains = @q.result.page(params[:page])
end
end
def show
@ -79,5 +82,19 @@ class Admin::DomainsController < AdminController
dp[:statuses].reject!(&:blank?)
dp
end
def normalize_search_parameters
ca_cache = params[:q][:valid_to_lteq]
begin
end_time = params[:q][:valid_to_lteq].try(:to_date)
params[:q][:valid_to_lteq] = end_time.try(:end_of_day)
rescue
logger.warn('Invalid date')
end
yield
params[:q][:valid_to_lteq] = ca_cache
end
end