From 16814af474bd23943bbeca32887194e6253aeb2f Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Wed, 6 Nov 2019 16:30:20 +0100 Subject: [PATCH] Make (part of) the html valid again simple_format always wraps its content so the better idea I have got was to use a span to avoid p in p. --- app/helpers/string_to_html_helper.rb | 4 ++-- app/views/users/_procedure_footer.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/helpers/string_to_html_helper.rb b/app/helpers/string_to_html_helper.rb index 76a595699..1bdb188f0 100644 --- a/app/helpers/string_to_html_helper.rb +++ b/app/helpers/string_to_html_helper.rb @@ -1,6 +1,6 @@ module StringToHtmlHelper - def string_to_html(str) - html_formatted = simple_format(str) + def string_to_html(str, wrapper_tag = 'p') + html_formatted = simple_format(str, {}, { wrapper_tag: wrapper_tag }) with_links = html_formatted.gsub(URI.regexp, '\0') sanitize(with_links, attributes: ['target', 'rel', 'href']) end diff --git a/app/views/users/_procedure_footer.html.haml b/app/views/users/_procedure_footer.html.haml index 230319df8..2a206f23d 100644 --- a/app/views/users/_procedure_footer.html.haml +++ b/app/views/users/_procedure_footer.html.haml @@ -10,7 +10,7 @@ %br = service.organisme %br - = string_to_html(service.adresse) + = string_to_html(service.adresse, wrapper_tag = 'span') %li.footer-column %h3.footer-header Poser une question sur votre dossier : @@ -28,7 +28,7 @@ %p - horaires = "Horaires : #{formatted_horaires(service.horaires)}" - = simple_format(horaires) + = simple_format(horaires, {}, wrapper_tag: 'span') - politiques = politiques_conservation_de_donnees(procedure)