From f729b15c1c700e7a248116738e55028ee0b410a9 Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Mon, 26 Apr 2021 14:33:51 -0700 Subject: [PATCH] LP#1923225: clean up some double-escaping of HTML in record display Signed-off-by: Jeff Davis Signed-off-by: Michele Morgan Signed-off-by: Galen Charlton --- Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 | 1 - Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 | 4 ++-- Open-ILS/src/templates/opac/parts/record/series.tt2 | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 index 4daf3be527..efe3349714 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 @@ -192,7 +192,6 @@ BLOCK render_all_contents; IF df AND attrs.hl.$df.size; filtered_hl_df = []; FOR hl_df IN attrs.hl.$df; - hl_df = hl_df | html; filtered_hl_df.push(hl_df); END; content = '' _ filtered_hl_df.join('
'); diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 index 8f3e57cc19..ea93d55e0b 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 @@ -7,12 +7,12 @@ BLOCK render_series; IF attrs.hl_display_fields.series_title.size; hl_field = attrs.hl_field; FOREACH s IN attrs.hl_display_fields.series_title; - search_term = s.value.replace('[#"^$\+\-,\.:;&|\[\]()]', ' ').replace('\s+$', '') | html; + search_term = s.value.replace('[#"^$\+\-,\.:;&|\[\]()]', ' ').replace('\s+$', ''); url = mkurl(ctx.opac_root _ '/results', { qtype=>'series', query=>search_term }, stop_parms.merge(expert_search_parms, general_search_parms, browse_search_parms, facet_search_parms) ); - filtered_hl_field = s.$hl_field | html; + filtered_hl_field = s.$hl_field; series = '' _ filtered_hl_field _ ' '; results.push(series); END; diff --git a/Open-ILS/src/templates/opac/parts/record/series.tt2 b/Open-ILS/src/templates/opac/parts/record/series.tt2 index 473e7544de..be52dcb939 100644 --- a/Open-ILS/src/templates/opac/parts/record/series.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/series.tt2 @@ -7,12 +7,12 @@ BLOCK render_series; IF attrs.hl_display_fields.series_title.size; hl_field = attrs.hl_field; FOREACH s IN attrs.hl_display_fields.series_title; - search_term = s.value.replace('[#"^$\+\-,\.:;&|\[\]()]', ' ').replace('\s+$', '') | html; + search_term = s.value.replace('[#"^$\+\-,\.:;&|\[\]()]', ' ').replace('\s+$', ''); url = mkurl(ctx.opac_root _ '/results', { qtype=>'series', query=>search_term }, stop_parms.merge(expert_search_parms, general_search_parms, browse_search_parms, facet_search_parms) ); - filtered_hl_field = s.$hl_field | html; + filtered_hl_field = s.$hl_field; series = '' _ filtered_hl_field _ ' '; results.push(series); END; -- 2.11.0