Merge pull request #5465 from betagouv/corrige-mise-en-forme-commentaire

corrige mise en forme commentaire
2020-08-10 17:53:24 +02:00 · 2020-08-10 17:53:24 +02:00 · 10fe9020ea
commit 10fe9020ea
parent 971ca18082 eea5fd66ad
2 changed files with 6 additions and 1 deletions
--- a/app/helpers/commentaire_helper.rb
+++ b/app/helpers/commentaire_helper.rb
@ -22,4 +22,9 @@ module CommentaireHelper
    template = is_current_year ? :message_date : :message_date_with_year
    I18n.l(commentaire.created_at, format: template)
  end
+
+  def pretty_commentaire(commentaire)
+    body_formatted = commentaire.sent_by_system? ? commentaire.body : simple_format(commentaire.body)
+    sanitize(body_formatted)
+  end
 end
--- a/app/views/shared/dossiers/messages/_message.html.haml
+++ b/app/views/shared/dossiers/messages/_message.html.haml
@ -8,7 +8,7 @@
      %span.guest Invité
    %span.date{ class: highlight_if_unseen_class(messagerie_seen_at, commentaire.created_at) }
      = commentaire_date(commentaire)
-  .rich-text= sanitize(simple_format(commentaire.body))
+  .rich-text= pretty_commentaire(commentaire)

  .message-extras.flex.justify-start
    - if commentaire.piece_jointe.attached?