From 0126414321a6ba675122af68959f9664aacfc90c Mon Sep 17 00:00:00 2001 From: Jeff Davis Date: Mon, 9 Nov 2020 13:59:59 -0800 Subject: [PATCH] LP#1902965: HTML filter on OPAC search results and record display Signed-off-by: Jeff Davis Signed-off-by: Jason Boyer Signed-off-by: Jason Stephenson Signed-off-by: Jane Sandberg --- Open-ILS/src/templates/opac/parts/record/body.tt2 | 4 +- .../src/templates/opac/parts/record/contents.tt2 | 7 +++- .../src/templates/opac/parts/record/series.tt2 | 3 +- .../src/templates/opac/parts/record/subjects.tt2 | 2 +- .../src/templates/opac/parts/record/summary.tt2 | 48 ++++++++++++++-------- Open-ILS/src/templates/opac/parts/result/table.tt2 | 16 ++++---- 6 files changed, 49 insertions(+), 31 deletions(-) diff --git a/Open-ILS/src/templates/opac/parts/record/body.tt2 b/Open-ILS/src/templates/opac/parts/record/body.tt2 index 2801670de8..11cb1ee9ee 100644 --- a/Open-ILS/src/templates/opac/parts/record/body.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/body.tt2 @@ -7,10 +7,10 @@ %]
[%- FOREACH link IN args.links.sameAs; %] - + [%- END; %] [%- FOREACH link IN args.links.exampleOfWork; %] - + [%- END; %] [%- INCLUDE "opac/parts/record/navigation.tt2" %] [%- IF ctx.bib_is_dead %] diff --git a/Open-ILS/src/templates/opac/parts/record/contents.tt2 b/Open-ILS/src/templates/opac/parts/record/contents.tt2 index 38f6271516..c9c38562d8 100644 --- a/Open-ILS/src/templates/opac/parts/record/contents.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/contents.tt2 @@ -190,7 +190,12 @@ BLOCK render_all_contents; content = ''; df = cont.display_field; IF df AND attrs.hl.$df.size; - content = '' _ attrs.hl.$df.join('
'); + 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('
'); ELSE; content = PROCESS render_contents(xpath=cont.xpath); END; diff --git a/Open-ILS/src/templates/opac/parts/record/series.tt2 b/Open-ILS/src/templates/opac/parts/record/series.tt2 index a5ad664c8b..473e7544de 100644 --- a/Open-ILS/src/templates/opac/parts/record/series.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/series.tt2 @@ -12,7 +12,8 @@ BLOCK render_series; 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) ); - series = '' _ s.$hl_field _ ' '; + filtered_hl_field = s.$hl_field | html; + series = '' _ filtered_hl_field _ ' '; results.push(series); END; ELSE; diff --git a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates/opac/parts/record/subjects.tt2 index f987125c38..9011853088 100644 --- a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/subjects.tt2 @@ -91,7 +91,7 @@ ''; %][% s.$f %] [%- + -%]">[% s.$f | html %] [%- ''; END; %] diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2 index fb6f84a1e8..43cd0ea9dc 100644 --- a/Open-ILS/src/templates/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2 @@ -39,7 +39,7 @@ isbnissn=attrs.issns.0; END; %] - + [% l('Image of item') %] @@ -75,7 +75,7 @@ + [% img_alt(l('Place Hold on [_1]', attrs.title)) | html %]/> [% l('Place Hold') %]
[%- END -%] @@ -85,14 +85,14 @@ + [% img_alt(l('Check Out [_1]', attrs.title)) | html %]/> [% l('Check Out E-Item') %] [%- END -%] @@ -107,7 +107,7 @@ rel="nofollow" vocab="" data-recid="[% ctx.bre_id %]" data-action="add" class="no-dec mylist_action [% IF ctx.mylist.grep('^' _ ctx.bre_id _ '$').size %]hidden[% END %]" - title="[% l("Add [_1] to basket", attrs.title) %]" rel="nofollow" vocab=""> + title="[% l("Add [_1] to basket", attrs.title) | html %]" rel="nofollow" vocab=""> [% l("Add to basket") %] @@ -115,7 +115,7 @@ rel="nofollow" vocab="" data-recid="[% ctx.bre_id %]" data-action="delete" class="mylist_action [% IF !ctx.mylist.grep('^' _ ctx.bre_id _ '$').size %]hidden[% END %]" - title="[% l("Remove [_1] from basket", attrs.title) %]" rel="nofollow" vocab=""> + title="[% l("Remove [_1] from basket", attrs.title) | html %]" rel="nofollow" vocab=""> [% l("Remove from basket") %] @@ -213,20 +213,25 @@ IF num_uris > 0;
[%- IF num_uris > 1 %]