Merge branch 'master' of gitlab.quartz.xyz:quartz/negos_app

This commit is contained in:
Nicolas Bally 2016-06-05 23:35:49 +02:00
commit 79c870a7ff

View File

@ -1,6 +1,9 @@
%tr %tr
%td %td
= link_to contact_message.contact.fullname + " (#{contact_message.contact.organisation})", edit_admin_customer_path( contact_message.contact) -if contact_message.contact
= link_to contact_message.contact.fullname + " (#{contact_message.contact.organisation})", edit_admin_customer_path( contact_message.contact)
-else
Utilisateur supprimé
%td %td
="#{contact_message.last_at.strftime('%d/%m/%Y à %H:%M')}, il y a #{time_ago_in_words(contact_message.last_at)}" ="#{contact_message.last_at.strftime('%d/%m/%Y à %H:%M')}, il y a #{time_ago_in_words(contact_message.last_at)}"
%td{style:"text-align:center"} %td{style:"text-align:center"}
@ -12,4 +15,4 @@
-else -else
Aucun Aucun
%td{:style => "width:100px;text-align:right"} %td{:style => "width:100px;text-align:right"}
=link_to i(:"comments"), admin_conversation_path(contact_message.conversation_id) =link_to i(:"comments"), admin_conversation_path(contact_message.conversation_id) if contact_message.conversation_id