From e96b18161900898abdcaf8dccf3e68cb10fce1f7 Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Tue, 29 Dec 2020 13:35:58 -0500 Subject: [PATCH] PINES Customizations to OPAC - Advanced Search Fix problems with advanced search filter display on search results page. Signed-off-by: Terran McCanna --- .../opac/parts/result/adv_filter.tt2 | 66 +++++++++++----------- .../templates-bootstrap/opac/parts/searchbar.tt2 | 10 ++-- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/adv_filter.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/adv_filter.tt2 index 39a42073f7..3c4e6382f1 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/adv_filter.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/adv_filter.tt2 @@ -11,48 +11,50 @@ FOR filter IN ctx.query_struct.filters; IF crad AND NOT pubdate_filters.grep('^' _ filter.name _ '$').size; remove_filter = 'fi:' _ fname; -%] -
+
-
[% IF filter.negate; l('Not'); END %] [% (crad.description || crad.label) | html %]
-
[% temp = []; - FOR fval IN fvalues; - thing = ctx.search_ccvm('ctype',fname,'code',fval).0; - display_value = thing.search_label || thing.value; - IF display_value.defined; - temp.push(display_value); - END; - END; - FOR display_value IN temp.sort; - %] - - [% display_value | html %] - - [% UNLESS loop.last %] - [% l('OR') %] - [% END %] - [% END; # FOR %] -
- × -
-
+
[% IF filter.negate; l('Not'); END %] [% (crad.description || crad.label) | html %]:
+
[% temp = []; + FOR fval IN fvalues; + thing = ctx.search_ccvm('ctype',fname,'code',fval).0; + display_value = thing.search_label || thing.value; + IF display_value.defined; + temp.push(display_value); + END; + END; + FOR display_value IN temp.sort; + %] + + [% display_value | html %] + + [% UNLESS loop.last %] + [% l('or') %] + [% END %] + [% END; # FOR %] +
+ × +
[%- END; # IF crad -%] [%- IF filter.name == 'locations'; locs = ctx.search_acpl('id',filter.args) -%] -