From 31d19ff64e6becc0c0bcfc6396fb626339ffe03b Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Thu, 30 Jul 2015 12:32:01 +0300
Subject: [PATCH] Normalize dates before search #2122

---
 app/controllers/admin/domains_controller.rb | 21 +++++++++++++++++++--
 app/views/admin/domains/index.haml          |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb
index 768ff3c6d..ec33f1f8d 100644
--- a/app/controllers/admin/domains_controller.rb
+++ b/app/controllers/admin/domains_controller.rb
@@ -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
 
diff --git a/app/views/admin/domains/index.haml b/app/views/admin/domains/index.haml
index dfc9d1e60..e7ab91ccb 100644
--- a/app/views/admin/domains/index.haml
+++ b/app/views/admin/domains/index.haml
@@ -28,11 +28,11 @@
         .col-md-3
           .form-group
             = 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
           .form-group
             = 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
         .col-md-9
           .form-group