Merge branch '108869472-objects_archive' into staging

app/controllers/admin/contact_versions_controller.rb

@@ -30,7 +30,7 @@ class Admin::ContactVersionsController < AdminController
   def show
     per_page = 7
     @version = ContactVersion.find(params[:id])
-    @q = ContactVersion.where(item_id: @version.item_id).search
+    @q = ContactVersion.where(item_id: @version.item_id).order(created_at: :asc).search
     @versions = @q.result.page(params[:page])
     @versions = @versions.per(per_page)
   end

app/controllers/admin/domain_versions_controller.rb

@@ -9,12 +9,12 @@ class Admin::DomainVersionsController < AdminController
     search_params = params[:q].deep_dup
 
     if search_params[:registrant]
-      registrant = Contact.find_by_name(search_params[:registrant])
+      registrant = Contact.find_by(name: search_params[:registrant])
       search_params.delete(:registrant)
     end
 
     if search_params[:registrar]
-      registrar = Registrar.find_by_name(search_params[:registrar])
+      registrar = Registrar.find_by(name: search_params[:registrar])
       search_params.delete(:registrar)
     end
 
@@ -30,8 +30,8 @@ class Admin::DomainVersionsController < AdminController
       end
     end
 
-    whereS += "  AND object->>'registrant_id' ~ '#{registrant.id}'" if registrant
+    whereS += "  AND object->>'registrant_id' = '#{registrant.id}'" if registrant
-    whereS += "  AND object->>'registrar_id' ~ '#{registrar.id}'" if registrar
+    whereS += "  AND object->>'registrar_id' = '#{registrar.id}'" if registrar
 
     versions = DomainVersion.includes(:item).where(whereS)
     @q = versions.search(params[:q])
@@ -44,7 +44,7 @@ class Admin::DomainVersionsController < AdminController
   def show
     per_page = 7
     @version = DomainVersion.find(params[:id])
-    @q = DomainVersion.where(item_id: @version.item_id).search
+    @q = DomainVersion.where(item_id: @version.item_id).order(created_at: :desc).search
     @versions = @q.result.page(params[:page])
     @versions = @versions.per(per_page)
   end

app/views/admin/contact_versions/index.haml

@@ -62,6 +62,7 @@
               = t(:action)
         %tbody
           - @versions.each do |version|
+            - if version.reify
               %tr
                 %td= link_to(version.reify.name, admin_contact_version_path(version.id))
                 %td= version.reify.code

app/views/admin/contact_versions/show.haml

@@ -5,7 +5,7 @@
     .panel.panel-default{:style => "min-height:420px;"}
       .panel-heading
         %h3.panel-title
-          = l(@version.reify.updated_at, format: :short)
+          = l(@version.created_at, format: :short)
           = @version.event
           = plain_username(@version.terminator)
       .panel-body
@@ -85,12 +85,12 @@
           - if vs.id == @version.id
             %li.active
               = link_to admin_contact_version_path(vs.id) do
-                = l(vs.reify.updated_at, format: :short)
+                = l(vs.created_at, format: :short)
                 = vs.event
           - else
             %li
               = link_to admin_contact_version_path(vs.id) do
-                = l(vs.reify.updated_at, format: :short)
+                = l(vs.created_at, format: :short)
                 = vs.event
       %span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
         = paginate @versions

app/views/admin/domain_versions/archive.haml

@@ -55,6 +55,7 @@
               = t(:action)
         %tbody
           - @versions.each do |version|
+            - if version.reify
               %tr
                 %td= link_to(version.reify.name, admin_domain_version_path(version.id))
                 %td

app/views/admin/domain_versions/show.haml

@@ -15,7 +15,7 @@
     .panel.panel-default{:style => "min-height:400px;"}
       .panel-heading
         %h3.panel-title
-          = l(@version.reify.updated_at, format: :short)
+          = l(@version.created_at, format: :short)
           = event
           = creator
       .panel-body
@@ -80,15 +80,15 @@
     .panel.panel-default{:style => "min-height:400px;"}
       %ul.nav.nav-pills.nav-stacked
         - @versions.each do |vs|
-          - if vs.id == @version.id
+          - if vs.id == @version.id and vs.reify
             %li.active
               = link_to admin_domain_version_path(vs.id) do
-                = l(vs.reify.updated_at, format: :short)
+                = l(vs.created_at, format: :short)
                 = vs.event
           - else
             %li
               = link_to admin_domain_version_path(vs.id) do
-                = l(vs.reify.updated_at, format: :short)
+                = l(vs.created_at, format: :short)
                 = vs.event
       %span{:style => "padding-left:10px; position: absolute; bottom: 10px;"}
         = paginate @versions