108869472-archive_modifications

app/views/admin/contact_versions/index.haml

@@ -79,6 +79,8 @@
   .col-md-6
     = paginate @versions
   .col-md-6.text-right
+    .pagination
+      = t(:result_count, count: @versions.total_count)
 
 
 :coffee

app/views/admin/contact_versions/show.haml

@@ -1,5 +1,7 @@
 = render 'shared/title', name: @version.reify.name
 
+- contact = @version.reify
+
 .row
   .col-md-8
     .panel.panel-default{:style => "min-height:420px;"}
@@ -11,55 +13,56 @@
       .panel-body
         %dl.dl-horizontal
           %dt= t(:id)
-          %dd= @version.reify.code
+          %dd= contact.code
 
           %dt= t(:ident)
-          %dd= ident_for(@version.reify)
+          %dd= ident_for(contact)
 
           %dt= t(:email)
-          %dd= @version.reify.email
+          %dd= contact.email
 
+          - if contact.phone
             %dt= t(:phone)
-          %dd= @version.reify.phone
+            %dd= contact.phone
 
-          - if @version.reify.fax
+          - if contact.fax
             %dt= t(:fax)
-            %dd= @version.reify.fax
+            %dd= contact.fax
 
           %br
 
           %dt= t(:created)
           %dd
-            = l(@version.reify.created_at, format: :short)
+            = l(contact.created_at, format: :short)
 
           %dt= t(:updated)
           %dd
-            = l(@version.reify.updated_at, format: :short)
+            = l(contact.updated_at, format: :short)
 
           %dt= t(:registrar)
           %dd
-            - if @version.reify.registrar.present?
-              = link_to(@version.reify.registrar, admin_registrar_path(@version.reify.registrar))
+            - if contact.registrar.present?
+              = link_to(contact.registrar, admin_registrar_path(contact.registrar))
 
         %dl.dl-horizontal
-          - if @version.reify.org_name.present?
+          - if contact.org_name.present?
             %dt= t(:org_name)
-            %dd= @version.reify.org_name
+            %dd= contact.org_name
 
           %dt= t(:street)
-          %dd= @version.reify.street.to_s.gsub("\n", '<br>').html_safe
+          %dd= contact.street.to_s.gsub("\n", '<br>').html_safe
 
           %dt= t(:city)
-          %dd= @version.reify.city
+          %dd= contact.city
 
           %dt= t(:zip)
-          %dd= @version.reify.zip
+          %dd= contact.zip
 
           %dt= t(:state)
-          %dd= @version.reify.state
+          %dd= contact.state
 
           %dt= t(:country)
-          %dd= @version.reify.country
+          %dd= contact.country
 
 
       %span{:style => "padding-right:10px; float: right;"}

app/views/admin/domain_versions/archive.haml

@@ -55,15 +55,15 @@
               = t(:action)
         %tbody
           - @versions.each do |version|
-            - if version.reify
+            - if domain = version.reify
               %tr
-                %td= link_to(version.reify.name, admin_domain_version_path(version.id))
+                %td= link_to(domain.name, admin_domain_version_path(version.id))
                 %td
-                  - if version.reify.registrant
-                    = link_to(version.reify.registrant, admin_registrant_path(version.reify.registrant))
+                  - if domain.registrant
+                    = domain.registrant
                 %td
-                  - if version.reify.registrar
-                    = link_to(version.reify.registrar, admin_registrar_path(version.reify.registrar))
+                  - if domain.registrar
+                    = link_to(domain.registrar, admin_registrar_path(domain.registrar))
                 %td= l(version.created_at, format: :short)
                 %td= version.event
 
@@ -72,6 +72,8 @@
   .col-md-6
     = paginate @versions
   .col-md-6.text-right
+    .pagination
+      = t(:result_count, count: @versions.total_count)
 
 
 :coffee

app/views/admin/domain_versions/show.haml

@@ -8,6 +8,7 @@
   - registrant     = Contact.where(id: children[:registrant])
   - event       = @version.event
   - creator     = plain_username(@version.terminator)
+  - domain = @version.reify
 
 
 .row
@@ -21,11 +22,13 @@
       .panel-body
         %dl.dl-horizontal
           %dt= t(:name)
-          %dd= link_to(@version.reify.name, admin_domain_path(@version.item_id))
+          %dd= link_to(domain.name, admin_domain_path(@version.item_id))
+          %dt= t(:registered_at)
+          %dd= l(domain.registered_at, format: :short)
           %dt= t(:statuses)
           %dd
-            - if @version.reify.statuses.present?
-              - @version.reify.statuses.each do |s|
+            - if domain.statuses.present?
+              - domain.statuses.each do |s|
                 = s
           %dt= t(:registrant)
           %dd
@@ -59,7 +62,7 @@
               = ns[:ipv6]
               %br
           %dt= t(:registrar)
-          %dd= @version.reify.registrar.name
+          %dd= domain.registrar.name
       %span{:style => "padding-right:10px; padding-top:40px; float: right; bottom: 10px;"}
         - if @version.previous
           = link_to(t(:previous),