From 2d72e838c007d9f8f15089ea1af2c6f843f1fc74 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Wed, 19 Oct 2022 10:54:19 -0400
Subject: [PATCH] LP1970476 Where filter in Bootstrap Catalog Produces Unwanted
 Results

Prior to this change, the Advanced Search page split the library selector
and the "Where" scope selector into two separate dropdown lists that
produced unexpected results when both were used.

This change uses the same approach as the combined dropdown on the Basic
search page instead.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: John Amundson <jamundson@cwmars.org>
Signed-off-by: Jason Stephenson <jason@sigio.com>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 | 6 +++---
 Open-ILS/src/templates-bootstrap/opac/parts/config.tt2          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
index f22c7ff3d5..df4d377070 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
@@ -5,8 +5,8 @@
 <form action="[% ctx.opac_root %]/results" method="get">
 <div id='adv_global_search' class='data_grid data_grid_center'>
     <div id='adv_search_rows' class="container">
-        <h1 class="text-center">[% l("Advanced Search") %]</h1>
-        <h2 class="text-center">[% l("Refine your search by filling out one or more fields to search by below.") %]</h2>
+        <h1 class="text-center">Advanced Search</h1>
+        <h2 class="text-center">Refine your search by filling out one or more fields to search by below.</h2>
         <div class='adv_global_input_container row'>
             <table role="presentation" id="adv_global_input_table" class="mx-auto col-12">
                 <tbody id="adv_global_tbody">
@@ -85,7 +85,7 @@
         <div class='col-12 my-2'>
             <div [% IF adv_chunk.js_only %] id='adv_chunk_[% adv_chunk.adv_special %]' class='hidden' [% END %]>
                 <strong><label for="[% adv_chunk.id %]"> [% adv_chunk.adv_label %] </label></strong>
-                    [% IF adv_chunk.adv_special == "lib_selector"; PROCESS "opac/parts/org_selector.tt2"; INCLUDE build_org_selector show_loc_groups=0 show_lassos=0 id=adv_chunk.id %]
+                    [% IF adv_chunk.adv_special == "lib_selector"; PROCESS "opac/parts/org_selector.tt2"; INCLUDE build_org_selector show_loc_groups=1 show_lassos=1 id=adv_chunk.id %]
                     [% ELSIF adv_chunk.adv_special == "scope_selector"; PROCESS "opac/parts/org_selector.tt2"; INCLUDE build_scope_selector show_loc_groups=1 show_lassos=1 id=adv_chunk.id %]
                     [% ELSIF adv_chunk.adv_special == "pub_year"; %]
                     <div class="adv_special_block text-center form-inline">
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2
index d9e929cc41..442e536165 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/config.tt2
@@ -149,7 +149,7 @@ search.adv_config = [
     {adv_label => l("Literary Form"), adv_attr => "lit_form", id => 'adv_selector_lit_form'},
     {adv_label => l("Shelving Location"), adv_special => "copy_location", id => 'adv_copy_location_selector', js_only => 101, adv_break => 1},
     {adv_label => l("Search Library"), adv_special => "lib_selector", id => 'adv_org_selector'},
-    {adv_label => l("Where"), adv_special => "scope_selector", id => 'adv_scope_selector'},
+    #{adv_label => l("Where"), adv_special => "scope_selector", id => 'adv_scope_selector'},
     {adv_label => l("Publication Year"), adv_special => "pub_year", id => 'adv_selector_pub_year'},
     {adv_label => l("Sort Results"), adv_special => "sort_selector", id => 'adv_selector_sort_results'},
 ];
-- 
2.11.0