Merge branch '108869472-objects_archive' into staging

app/controllers/admin/contact_versions_controller.rb

@@ -6,12 +6,18 @@ class Admin::ContactVersionsController < AdminController
 
     @q = ContactVersion.search(params[:q])
     @versions = @q.result.page(params[:page])
+    search_params = params[:q].deep_dup
 
     whereS = "1=1"
 
-    params[:q].each do |key, value|
+    search_params.each do |key, value|
       next if value.empty?
-      whereS += create_where_string(key, value)
+      case key
+        when 'event'
+          whereS += " AND event = '#{value}'"
+        else
+          whereS += create_where_string(key, value)
+      end
     end
 
     versions = ContactVersion.includes(:item).where(whereS)
@@ -21,6 +27,14 @@ class Admin::ContactVersionsController < AdminController
 
   end
 
+  def show
+    per_page = 7
+    @version = ContactVersion.find(params[:id])
+    @q = ContactVersion.where(item_id: @version.item_id).search
+    @versions = @q.result.page(params[:page])
+    @versions = @versions.per(per_page)
+  end
+
   def search
     render json: ContactVersion.search_by_query(params[:q])
   end

app/controllers/admin/domain_versions_controller.rb

@@ -22,7 +22,12 @@ class Admin::DomainVersionsController < AdminController
 
     search_params.each do |key, value|
       next if value.empty?
-      whereS += create_where_string(key, value)
+      case key
+        when 'event'
+        whereS += " AND event = '#{value}'"
+      else
+        whereS += create_where_string(key, value)
+      end
     end
 
     whereS += "  AND object->>'registrant_id' ~ '#{registrant.id}'" if registrant
@@ -36,6 +41,14 @@ class Admin::DomainVersionsController < AdminController
 
   end
 
+  def show
+    per_page = 7
+    @version = DomainVersion.find(params[:id])
+    @q = DomainVersion.where(item_id: @version.item_id).search
+    @versions = @q.result.page(params[:page])
+    @versions = @versions.per(per_page)
+  end
+
   def search
     render json: DomainVersion.search_by_query(params[:q])
   end