Contact index show ident in correct format

This commit is contained in:
Priit Tark 2015-04-15 12:23:39 +03:00
parent 01a43b86f6
commit 921d8374f5
3 changed files with 23 additions and 15 deletions

View file

@ -10,11 +10,21 @@ module ApplicationHelper
end
def ident_for(contact)
case contact.ident_type
when 'birthday'
"#{contact.ident} [#{contact.ident_type}]"
if contact.kind_of? Hash
ident_country_code = contact[:ident_country_code]
ident_type = contact[:ident_type]
ident = contact[:ident]
else
"#{contact.ident} [#{contact.ident_country_code} #{contact.ident_type}]"
ident_country_code = contact.ident_country_code
ident_type = contact.ident_type
ident = contact.ident
end
case ident_type
when 'birthday'
"#{ident} [#{ident_type}]"
else
"#{ident} [#{ident_country_code} #{ident_type}]"
end
end

View file

@ -16,7 +16,7 @@
%tr
%td= link_to(c[:name], registrar_contact_path(id: c[:code]))
%td= c[:code]
%td= c[:ident]
%td= ident_for(c)
%td
= link_to(t(:edit), edit_registrar_contact_path(c[:code]), class: 'btn btn-primary btn-xs')
= link_to(t(:delete), delete_registrar_contact_path(c[:code]), class: 'btn btn-default btn-xs')

View file

@ -3,21 +3,19 @@
%h3.panel-title= t(:general)
.panel-body
%dl.dl-horizontal
%dt= t(:ident)
%dd= ident_for(@contact)
%dt= t(:contact_code)
%dd= @contact.id
%dt= t(:password)
%dd= @contact.password
%br
%dt= t(:ident)
%dd= ident_for(@contact)
%dt= t(:email)
%dd= @contact.email
%dt= t(:phone)
%dd= @contact.phone
%br
%dt= t(:contact_code)
%dd= @contact.id
%dt= t(:password)
%dd= @contact.password