[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. f46fbdf5d3e31f8a8c3248b03aa85591ac23db02

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_12 has been updated
       via  f46fbdf5d3e31f8a8c3248b03aa85591ac23db02 (commit)
      from  f37e6c73176d2ab83f5b2ff5780263120b1e5daa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f46fbdf5d3e31f8a8c3248b03aa85591ac23db02
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Wed May 17 12:11:33 2017 -0400

    LP#1677902: Remove search formats from advanced search limiter block
    
    The original behavior of the advanced search limiter block was to remove
    search formats from the display because it is available for limiting in the
    search bar. Other code broke this behavior, and I've now restored it by
    adding the ignore search format code to the searchbar.tt2 file. It also fixes
    a problem where the search format limiters were incorrectly displaying on the
    low hits page.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>

diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index a503484..e2fa5ba 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -8,21 +8,6 @@
 
     result_count = ctx.result_start;
 
-    # don't display a box for the search_format filter,
-    # as that's got its own widget
-    ignore_filters = ['search_format'];
-
-    trimmed_filters = [];
-    FOR filter IN ctx.query_struct.filters;
-        fname = filter.name;
-        IF ignore_filters.grep('^' _ fname _ '$').size;
-            NEXT;
-        END;
-        trimmed_filters.push(filter);
-    END;
-
-    ctx.query_struct.filters = trimmed_filters;
-
 %]
 
 [% PROCESS "opac/parts/result/paginate.tt2" %] 
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 5e25605..ddf68cf 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -12,7 +12,23 @@ FOR f IN ctx.query_struct.filters;
     fcount = fcount + 1;
 END;
 
+    # don't display a box for the search_format filter,
+    # as that's got its own widget
+    ignore_filters = ['search_format'];
+
+    trimmed_filters = [];
+    FOR filter IN ctx.query_struct.filters;
+        fname = filter.name;
+        IF ignore_filters.grep('^' _ fname _ '$').size;
+            NEXT;
+        END;
+        trimmed_filters.push(filter);
+    END;
+
+    ctx.query_struct.filters = trimmed_filters;
+
  %]
+
 <div id="search-wrapper">
     [% UNLESS took_care_of_form -%]
     <form action="[% ctx.opac_root %]/results" method="get">

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/opac/parts/result/table.tt2 |   15 ---------------
 Open-ILS/src/templates/opac/parts/searchbar.tt2    |   16 ++++++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Evergreen ILS