Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions decidim-core/app/cells/decidim/announcement_cell.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,23 @@ 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
return if announcement.is_a?(Hash) && announcement.values.any?(&:empty?)

clean(announcement)
end

def clean(value)
decidim_sanitize_admin(translated_attribute(value))
return if value.blank? || value.nil?

if value.include?("rich-text-display")
decidim_sanitize_admin(translated_attribute(value))
else
tag.p(decidim_sanitize_admin(translated_attribute(value)))
end
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -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(:p, class: "flash__message") do
concat value[:title]
concat content_tag(:span, value[:body], class: "flash__message-body")
end
Expand Down
2 changes: 1 addition & 1 deletion decidim-system/spec/system/organizations_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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\"")
Expand Down
Loading