From b013acad7cd9f7ab37904819daf5b3cccbf9de8f Mon Sep 17 00:00:00 2001
From: Stas <stanislav@perfectline.co>
Date: Fri, 8 Jul 2016 11:28:27 +0300
Subject: [PATCH] 108869472-filter_and_view_fixes

---
 app/controllers/admin/domain_versions_controller.rb | 5 ++++-
 app/views/admin/domain_versions/archive.haml        | 2 ++
 app/views/admin/domain_versions/show.haml           | 8 ++++----
 config/locales/en.yml                               | 1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/controllers/admin/domain_versions_controller.rb b/app/controllers/admin/domain_versions_controller.rb
index 8812f443c..6eb47fa64 100644
--- a/app/controllers/admin/domain_versions_controller.rb
+++ b/app/controllers/admin/domain_versions_controller.rb
@@ -25,6 +25,8 @@ class Admin::DomainVersionsController < AdminController
       case key
         when 'event'
         whereS += " AND event = '#{value}'"
+        when 'name'
+        whereS += " AND (object->>'name' ~* '#{value}' OR object_changes->>'name' ~* '#{value}')"
       else
         whereS += create_where_string(key, value)
       end
@@ -47,11 +49,12 @@ class Admin::DomainVersionsController < AdminController
     per_page = 7
     @version  = DomainVersion.find(params[:id])
     @versions = DomainVersion.where(item_id: @version.item_id).order(id: :desc)
+    @versions_map = @versions.all.map(&:id)
 
     # what we do is calc amount of results until needed version
     # then we cacl which page it is
     if params[:page].blank?
-      counter = @versions.where("id > ?", @version.id).count
+      counter = @versions_map.index(@version.id) + 1
       page    = counter / per_page
       page   += 1 if (counter % per_page) != 0
       params[:page] = page
diff --git a/app/views/admin/domain_versions/archive.haml b/app/views/admin/domain_versions/archive.haml
index 2ed111083..4e06f5ccb 100644
--- a/app/views/admin/domain_versions/archive.haml
+++ b/app/views/admin/domain_versions/archive.haml
@@ -69,6 +69,8 @@
                     - if contact.nil? && ver = ContactVersion.where(item_id: domain.registrant_id).last
                       - contact = Contact.new(ver.object.to_h.merge(ver.object_changes.to_h.each_with_object({}){|(k,v), o| o[k]=v.last } ))
                     = contact.try(:name)
+                    = "&#160;".html_safe
+                    = "(#{t(:deleted)})"
                 %td
                   - if domain.registrar
                     = link_to(domain.registrar, admin_registrar_path(domain.registrar))
diff --git a/app/views/admin/domain_versions/show.haml b/app/views/admin/domain_versions/show.haml
index d4dfa15f2..bd937b0c5 100644
--- a/app/views/admin/domain_versions/show.haml
+++ b/app/views/admin/domain_versions/show.haml
@@ -104,16 +104,16 @@
                 = domain.registrar.name
             %span{:style => "margin: 20px 20px; clear:both;"}
 
-        - if @version.previous
+        - if prev = @versions_map[(@versions_map.index(@version.id) - 1)]
           = link_to(t(:previous),
-                    admin_domain_version_path(@version.previous.id),
+                    admin_domain_version_path(prev),
                     class: 'btn btn-primary')
         - else
           %a.btn.btn-primary.disabled{:href => "#"}
             %span= t(:previous)
-        - if @version.next
+        - if nxt = @versions_map[(@versions_map.index(@version.id) + 1)]
           = link_to(t(:next),
-                    admin_domain_version_path(@version.next.id),
+                    admin_domain_version_path(nxt),
                     class: 'btn btn-default')
         - else
           %a.btn.btn-default.disabled{:href => "#"}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 400985d16..c42a4728d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -959,3 +959,4 @@ en:
   verified_confirm: 'Verified status is for cases when current registrant is the one applying for the update. Legal document signed by the registrant is required. Are you sure this update is properly verified with the registrant?'
   verified: 'Verified'
   only_estonian_residets_can_signin: "Access currently available only to Estonian citizens and e-residents with Estonian ID-card or Mobile-ID."
+  deleted: 'Deleted'
\ No newline at end of file