From f95a836f6b47bfac42395dba3c771966a2220e07 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Tue, 9 Dec 2025 15:43:02 +0100 Subject: [PATCH 1/7] fix: semantic html in flash message --- .../app/helpers/concerns/decidim/flash_helper_extensions.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb b/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb index 55f6f55f8f66d..1080b807fc426 100644 --- a/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb +++ b/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb @@ -118,9 +118,9 @@ def close_link end def message(value) - return content_tag(:div, value, class: "flash__message") unless value.is_a?(Hash) + return content_tag(:p, value, class: "flash__message") unless value.is_a?(Hash) - content_tag(:div, class: "flash__message") do + content_tag(:span, class: "flash__message") do concat value[:title] concat content_tag(:span, value[:body], class: "flash__message-body") end From 5e9b9ec044ab797a48c9260aa1a4657b95bb7f3b Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Tue, 9 Dec 2025 16:36:15 +0100 Subject: [PATCH 2/7] fix: update clean method in announcement cell to add p tags when needed --- decidim-core/app/cells/decidim/announcement_cell.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/decidim-core/app/cells/decidim/announcement_cell.rb b/decidim-core/app/cells/decidim/announcement_cell.rb index 5db34bc1465bb..80a3431ba194a 100644 --- a/decidim-core/app/cells/decidim/announcement_cell.rb +++ b/decidim-core/app/cells/decidim/announcement_cell.rb @@ -68,7 +68,7 @@ def body def clean_body return unless body - Array(body).map { |paragraph| tag.p(clean(paragraph)) }.join + Array(body).map { |paragraph| clean(paragraph) }.join end def clean_announcement @@ -76,7 +76,11 @@ def clean_announcement end def clean(value) - decidim_sanitize_admin(translated_attribute(value)) + if value == "
" + decidim_sanitize_admin(translated_attribute(value)) + else + tag.p(decidim_sanitize_admin(translated_attribute(value))) + end end end end From 8a7cb0c0a01081c14eb2ecba4abd7f837e0fc505 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Tue, 9 Dec 2025 16:50:58 +0100 Subject: [PATCH 3/7] fix: update condtion in clean method --- decidim-core/app/cells/decidim/announcement_cell.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decidim-core/app/cells/decidim/announcement_cell.rb b/decidim-core/app/cells/decidim/announcement_cell.rb index 80a3431ba194a..0eb68394acc10 100644 --- a/decidim-core/app/cells/decidim/announcement_cell.rb +++ b/decidim-core/app/cells/decidim/announcement_cell.rb @@ -76,7 +76,7 @@ def clean_announcement end def clean(value) - if value == "
" + if value.include?("rich-text-display") decidim_sanitize_admin(translated_attribute(value)) else tag.p(decidim_sanitize_admin(translated_attribute(value))) From 41321c6f41c29d3bb94da35f172a6d5d4521f02d Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Tue, 9 Dec 2025 17:17:57 +0100 Subject: [PATCH 4/7] fix: update message method --- .../app/helpers/concerns/decidim/flash_helper_extensions.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb b/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb index 1080b807fc426..af974e64ff140 100644 --- a/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb +++ b/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb @@ -118,9 +118,10 @@ def close_link end def message(value) + debugger return content_tag(:p, value, class: "flash__message") unless value.is_a?(Hash) - content_tag(:span, class: "flash__message") do + content_tag(:p, class: "flash__message") do concat value[:title] concat content_tag(:span, value[:body], class: "flash__message-body") end From ba72478add2a57f07c6101016760d8af2c798d1f Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Tue, 9 Dec 2025 17:18:44 +0100 Subject: [PATCH 5/7] fix: remove debugger --- .../app/helpers/concerns/decidim/flash_helper_extensions.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb b/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb index af974e64ff140..cd9da34c9fd50 100644 --- a/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb +++ b/decidim-core/app/helpers/concerns/decidim/flash_helper_extensions.rb @@ -118,7 +118,6 @@ def close_link end def message(value) - debugger return content_tag(:p, value, class: "flash__message") unless value.is_a?(Hash) content_tag(:p, class: "flash__message") do From 0a19de29d92106fda57e88d10b2a47511c7df824 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 10 Dec 2025 10:49:19 +0100 Subject: [PATCH 6/7] fix: update annoucement_cell methods --- decidim-core/app/cells/decidim/announcement_cell.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/decidim-core/app/cells/decidim/announcement_cell.rb b/decidim-core/app/cells/decidim/announcement_cell.rb index 0eb68394acc10..d64c7ee4a78f1 100644 --- a/decidim-core/app/cells/decidim/announcement_cell.rb +++ b/decidim-core/app/cells/decidim/announcement_cell.rb @@ -72,10 +72,14 @@ def clean_body end def clean_announcement + return if announcement.is_a?(Hash) && announcement.values.any?(&:empty?) + clean(announcement) end def clean(value) + return if value.blank? || value.nil? + if value.include?("rich-text-display") decidim_sanitize_admin(translated_attribute(value)) else From fea49b43ca1ac16ee02c9453a83ae47c3c904362 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Wed, 10 Dec 2025 10:49:50 +0100 Subject: [PATCH 7/7] test: fix failing test --- decidim-system/spec/system/organizations_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decidim-system/spec/system/organizations_spec.rb b/decidim-system/spec/system/organizations_spec.rb index 38797e01ef510..da263242ecfe4 100644 --- a/decidim-system/spec/system/organizations_spec.rb +++ b/decidim-system/spec/system/organizations_spec.rb @@ -53,7 +53,7 @@ check "Example authorization (Direct)" click_on "Create organization & invite admin" - within ".flash__message" do + within ".flash.success" do expect(page).to have_content("Organization successfully created.") expect(page).to have_content("config/environment/production.rb") expect(page).to have_content("config.hosts << \"www.example.org\"")