From e2a90ad471708124e101f962f5921e254f526cf6 Mon Sep 17 00:00:00 2001
From: Kathy Lussier <klussier@masslnc.org>
Date: Wed, 30 Nov 2016 20:56:08 -0500
Subject: [PATCH] Add new advanced search options to Boolean search page

The advanced search page now has a Shelving Location filter and an option for
to group formats and edition. They should be added to the Boolean search page
as well.

Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../src/templates/opac/parts/advanced/boolean.tt2  | 31 +++++++++++++++++++---
 Open-ILS/src/templates/opac/parts/config.tt2       |  2 +-
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/advanced/boolean.tt2 b/Open-ILS/src/templates/opac/parts/advanced/boolean.tt2
index 88f16d103c..56445738b7 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/boolean.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/boolean.tt2
@@ -42,14 +42,16 @@
                             <tr>
                 [%
                         END; %]
-                            <td valign='top'>
+                            <td valign='top'[% IF adv_chunk.js_only %]
+                                id='adv_chunk_[% adv_chunk.adv_special %]'
+                                class='hidden'[% END %]>
                                 <strong>[% adv_chunk.adv_label %]</strong><br />
                 [%
                         IF adv_chunk.adv_special;
                             SWITCH adv_chunk.adv_special;
                                 CASE "lib_selector";
                                     PROCESS "opac/parts/org_selector.tt2";
-                                        INCLUDE build_org_selector show_loc_groups=1; %]
+                                        INCLUDE build_org_selector show_loc_groups=1 id="adv_org_selector" %]
                                             <div style="position:relative;top:7px;">
                                                 <input type='checkbox' name="modifier"
                                                     value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
@@ -83,8 +85,29 @@
                                 CASE "sort_selector";
                                     INCLUDE "opac/parts/filtersort.tt2"
                                         value=CGI.param('sort') class='results_header_sel';
-                            END;
-                        ELSIF adv_chunk.adv_attr;
+                                    %]
+                        
+                    [% IF NOT metarecords.disabled %]
+                        <br/><!-- <br> may seem redundant, but it allows the
+                            <input> (below) to drop down inline w/ its label -->
+                        <div class="adv_search_available">
+                            <input type='checkbox' name="modifier" value="metabib"
+                              [%- CGI.param('modifier').grep('metabib').size ?
+                                    ' checked="checked"' : '' %]
+                                id='opac.result.ismetabib' />
+                            <label for='opac.result.ismetabib'>
+                                [% l("Group Formats and Editions") %]</label>
+                        </div>
+                    [% END %]
+
+                [% CASE "copy_location" %]
+                    <select id="adv_copy_location_selector"
+                        title="[% l('Select Shelving Location') %]"
+                        name="fi:locations" size="3" multiple="multiple">
+                    </select>
+                [%
+	     END;
+          ELSIF adv_chunk.adv_attr;
                             INCLUDE "opac/parts/coded_value_selector.tt2"
                                 attr=adv_chunk.adv_attr multiple="multiple" size="4";
                         ELSIF adv_chunk.adv_filter;
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index 4fdda27ac2..a81049996a 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -109,7 +109,7 @@ facet.display = [
 facet.default_display_count = 5;
 
 ##############################################################################
-# Define the advanced search limiters and labels.
+# Define the advanced search and Boolean search limiters and labels.
 # Each entry is put into a table cell.
 # adv_label is the (translated) label for the limiter
 # adv_attr is an array of possible limiters, the first one that has any
-- 
2.11.0