Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Fix PageHeader title, breadcrumbs double escaping

Alexander Brandon Colesa040181b895a
diff --git a/app/components/oauth/show_page_header_component.html.erb b/app/components/oauth/show_page_header_component.html.erb
index af35583704b..03a7a7200d0 100644
--- a/app/components/oauth/show_page_header_component.html.erb
+++ b/app/components/oauth/show_page_header_component.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@application.name) }
+ header.with_title_content(@application.name)
header.with_breadcrumbs(breadcrumb_items)
unless @application.builtin?
diff --git a/app/components/oauth/show_page_header_component.rb b/app/components/oauth/show_page_header_component.rb
index 531ff53dfb4..76a76cf543c 100644
--- a/app/components/oauth/show_page_header_component.rb
+++ b/app/components/oauth/show_page_header_component.rb
@@ -41,6 +41,6 @@ class OAuth::ShowPageHeaderComponent < ApplicationComponent
[{ href: admin_index_path, text: t(:label_administration) },
{ href: admin_settings_authentication_path, text: t(:label_authentication) },
{ href: oauth_applications_path, text: t("oauth.application.plural") },
- h(@application.name)]
+ @application.name]
end
end
diff --git a/app/components/wiki_pages/show_page_header_component.html.erb b/app/components/wiki_pages/show_page_header_component.html.erb
index cfc055be57f..d7dd08a7a65 100644
--- a/app/components/wiki_pages/show_page_header_component.html.erb
+++ b/app/components/wiki_pages/show_page_header_component.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title(test_selector: "wiki-page-header-title") { h(@page.title) }
+ header.with_title(test_selector: "wiki-page-header-title") { @page.title }
header.with_breadcrumbs(
helpers.breadcrumb_for_page(@project, @page),
data: { "test-selector": "wiki-page-header-breadcrumbs" }
diff --git a/app/views/oauth/applications/edit.html.erb b/app/views/oauth/applications/edit.html.erb
index 48baa29b785..79d012a1053 100644
--- a/app/views/oauth/applications/edit.html.erb
+++ b/app/views/oauth/applications/edit.html.erb
@@ -32,12 +32,12 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@application.name) }
+ header.with_title_content(@application.name)
header.with_breadcrumbs(
[{ href: admin_index_path, text: t(:label_administration) },
{ href: admin_settings_authentication_path, text: t(:label_authentication) },
{ href: oauth_applications_path, text: t("oauth.application.plural") },
- h(@application.name)]
+ @application.name]
)
end
%>
diff --git a/app/views/wiki/annotate.html.erb b/app/views/wiki/annotate.html.erb
index 110c62a6897..45a0d27fd68 100644
--- a/app/views/wiki/annotate.html.erb
+++ b/app/views/wiki/annotate.html.erb
@@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@page.title) }
+ header.with_title_content(@page.title)
header.with_breadcrumbs(
breadcrumb_for_page(@project, @page)
)
diff --git a/app/views/wiki/destroy.html.erb b/app/views/wiki/destroy.html.erb
index e9e5adec6b7..9c0b2e2e076 100644
--- a/app/views/wiki/destroy.html.erb
+++ b/app/views/wiki/destroy.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
<% html_title t(:button_delete), @page.title %>
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@page.title) }
+ header.with_title_content(@page.title)
header.with_breadcrumbs(
breadcrumb_for_page(@project, @page)
)
diff --git a/app/views/wiki/diff.html.erb b/app/views/wiki/diff.html.erb
index a0b98d117ba..92209524c9e 100644
--- a/app/views/wiki/diff.html.erb
+++ b/app/views/wiki/diff.html.erb
@@ -28,7 +28,7 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@page.title) }
+ header.with_title_content(@page.title)
header.with_breadcrumbs(
breadcrumb_for_page(@project, @page)
)
diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb
index d88f76fe8d4..f2ff1aea463 100644
--- a/app/views/wiki/edit.html.erb
+++ b/app/views/wiki/edit.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
<% html_title t(:label_edit), @page.title %>
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@page.title) }
+ header.with_title_content(@page.title)
header.with_breadcrumbs(
breadcrumb_for_page(@project, @page)
)
diff --git a/app/views/wiki/edit_parent_page.html.erb b/app/views/wiki/edit_parent_page.html.erb
index 8fb88386e5d..0604858712e 100644
--- a/app/views/wiki/edit_parent_page.html.erb
+++ b/app/views/wiki/edit_parent_page.html.erb
@@ -30,7 +30,7 @@ See COPYRIGHT and LICENSE files for more details.
<% html_title t("activerecord.models.wiki"), t(:button_change_parent_page) %>
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@page.title) }
+ header.with_title_content(@page.title)
header.with_breadcrumbs(
breadcrumb_for_page(@project, @page)
)
diff --git a/app/views/wiki/rename.html.erb b/app/views/wiki/rename.html.erb
index 8a77fd0f28c..e8f02d0219f 100644
--- a/app/views/wiki/rename.html.erb
+++ b/app/views/wiki/rename.html.erb
@@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@page.title) }
+ header.with_title_content(@page.title)
header.with_breadcrumbs(
breadcrumb_for_page(@project, @page)
)
diff --git a/app/views/wiki_menu_items/edit.html.erb b/app/views/wiki_menu_items/edit.html.erb
index 8d566ec4eb6..b7041d88f1b 100644
--- a/app/views/wiki_menu_items/edit.html.erb
+++ b/app/views/wiki_menu_items/edit.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@page.title) }
+ header.with_title_content(@page.title)
header.with_breadcrumbs(
breadcrumb_for_page(@project, @page)
)
diff --git a/app/views/wiki_menu_items/select_main_menu_item.html.erb b/app/views/wiki_menu_items/select_main_menu_item.html.erb
index bb3215e8435..50ef64461e8 100644
--- a/app/views/wiki_menu_items/select_main_menu_item.html.erb
+++ b/app/views/wiki_menu_items/select_main_menu_item.html.erb
@@ -28,7 +28,7 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@page.title) }
+ header.with_title_content(@page.title)
header.with_breadcrumbs(
breadcrumb_for_page(@project, @page, t(:label_select_main_menu_item))
)
diff --git a/modules/ldap_groups/app/components/ldap_groups/synchronized_filters/show_page_header_component.html.erb b/modules/ldap_groups/app/components/ldap_groups/synchronized_filters/show_page_header_component.html.erb
index 21b6981865c..280245a2498 100644
--- a/modules/ldap_groups/app/components/ldap_groups/synchronized_filters/show_page_header_component.html.erb
+++ b/modules/ldap_groups/app/components/ldap_groups/synchronized_filters/show_page_header_component.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@filter.name) }
+ header.with_title_content(@filter.name)
header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: :normal)
unless blocked?
diff --git a/modules/ldap_groups/app/components/ldap_groups/synchronized_filters/show_page_header_component.rb b/modules/ldap_groups/app/components/ldap_groups/synchronized_filters/show_page_header_component.rb
index 6c197e11652..a0252d54293 100644
--- a/modules/ldap_groups/app/components/ldap_groups/synchronized_filters/show_page_header_component.rb
+++ b/modules/ldap_groups/app/components/ldap_groups/synchronized_filters/show_page_header_component.rb
@@ -43,7 +43,7 @@ class LdapGroups::SynchronizedFilters::ShowPageHeaderComponent < ApplicationComp
{ href: admin_settings_authentication_path, text: t(:label_authentication) },
{ href: ldap_groups_synchronized_groups_path, text: I18n.t("ldap_groups.label_menu_item") },
helpers.nested_breadcrumb_element(t("ldap_groups.synchronized_filters.singular"),
- h(@filter.name))
+ @filter.name)
]
end
diff --git a/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/show.html.erb b/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/show.html.erb
index 8fc5ef8528c..2b6717fbb2c 100644
--- a/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/show.html.erb
+++ b/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/show.html.erb
@@ -2,7 +2,7 @@
<%=
render Primer::OpenProject::PageHeader.new do |header|
- header.with_title { h(@group.dn) }
+ header.with_title_content(@group.dn)
header.with_breadcrumbs(
[{ href: admin_index_path, text: t(:label_administration) },
{ href: admin_settings_authentication_path, text: t(:label_authentication) },