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

Normalize dates before search #2122

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

17
app/controllers/admin/domains_controller.rb
View file

@ -11,9 +11,12 @@ class Admin::DomainsController < AdminController
else else
domains = Domain.includes(:registrar, :registrant) domains = Domain.includes(:registrar, :registrant)
end end
normalize_search_parameters do
@q = domains.search(params[:q]) @q = domains.search(params[:q])
@domains = @q.result.page(params[:page]) @domains = @q.result.page(params[:page])
end end
end
def show def show
@domain.valid? @domain.valid?
@ -79,5 +82,19 @@ class Admin::DomainsController < AdminController
dp[:statuses].reject!(&:blank?) dp[:statuses].reject!(&:blank?)
dp dp
end 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 end

4
app/views/admin/domains/index.haml
View file

@ -28,11 +28,11 @@
.col-md-3 .col-md-3
.form-group .form-group
= f.label t(:valid_to_from) = f.label t(:valid_to_from)
= f.search_field :valid_to_gteq, class: 'form-control datepicker', placeholder: t(:valid_to_from), autocomplete: 'off' = f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control datepicker', placeholder: t(:valid_to_from)
.col-md-3 .col-md-3
.form-group .form-group
= f.label t(:valid_to_until) = f.label t(:valid_to_until)
= f.search_field :valid_to_lteq, class: 'form-control datepicker', placeholder: t(:valid_to_until), autocomplete: 'off' = f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until)
.row .row
.col-md-9 .col-md-9
.form-group .form-group