Move contact ident description to helper method

app/helpers/application_helper.rb

@@ -9,6 +9,14 @@ module ApplicationHelper
     "background-image: url(#{image_path("#{unstable_env}.png")});"
   end
 
+  def ident_for(contact)
+    ident = contact.ident
+    description = "[#{contact.ident_country_code} #{contact.ident_type}]"
+    description.prepend("#{ident} ") if ident.present?
+
+    description
+  end
+
   def current_commit_link
     hash = `git rev-parse --short HEAD`
     current_repo = `git remote get-url origin`.gsub('com:', 'com/')

app/views/admin/contact_versions/index.haml

@@ -69,7 +69,7 @@
               %tr
                 %td= link_to(contact.name, admin_contact_version_path(version.id))
                 %td= contact.code
-                %td= contact.ident_human_description
+                %td= ident_for(contact)
                 %td
                   - if contact.registrar
                     = link_to(contact.registrar, admin_registrar_path(contact.registrar))

app/views/admin/contact_versions/show.haml

@@ -22,7 +22,7 @@
 
           %dt= t(:ident)
           %dd{class: changing_css_class(@version,"ident_country_code", "ident_type", "ident")}
-            = contact.ident_human_description
+            = ident_for(contact)
 
           - if contact.email.present?
             %dt= t(:email)

app/views/admin/contacts/index.haml

@@ -100,7 +100,7 @@
             %tr
               %td= link_to(contact, admin_contact_path(contact))
               %td= contact.code
-              %td= contact.ident_human_description
+              %td= ident_for(contact)
               %td= contact.email
               %td= l(contact.created_at, format: :short)
               %td

app/views/admin/contacts/partials/_general.haml

@@ -14,7 +14,7 @@
       %br
 
       %dt.left_25= t(:ident)
-      %dd.left_25= @contact.ident_human_description
+      %dd.left_25= ident_for(@contact)
 
       %dt.left_25= t(:email)
       %dd.left_25= @contact.email

app/views/registrar/contacts/index.html.erb

@@ -44,7 +44,7 @@
                             <%= contact.code %>
                         </td>
                         <td>
-                            <%= contact.ident_human_description %>
+                            <%= ident_for(contact) %>
                         </td>
                         <td>
                             <%= l(contact.created_at, format: :short) %>

app/views/registrar/contacts/list_pdf.html.erb

@@ -20,7 +20,7 @@
                             <tr>
                                 <td><%= contact %></td>
                                 <td><%= contact.code %></td>
-                                <td><%= contact.ident_human_description %></td>
+                                <td><%= ident_for(contact) %></td>
                                 <td><%= l(contact.created_at, format: :short) %></td>
                                 <td><%= contact.registrar %></td>
                             </tr>

app/views/registrar/contacts/partials/_general.haml

@@ -14,7 +14,7 @@
       %br
 
       %dt= t(:ident)
-      %dd= @contact.ident_human_description
+      %dd= ident_for(@contact)
 
       %dt= t(:email)
       %dd= @contact.email