From 53e9309772206ac947d94eefd85a3e1fdf0cfdef Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Thu, 10 Feb 2022 23:48:13 +0000
Subject: [PATCH] Bug 30077: Add system preference
 IntranetAddMastheadLibraryPulldown

To test:
1. Apply patch, updatedatabase, restart_all
2. Search for the system pref 'IntranetAddMastheadLibraryPulldown'
3. Set it to 'Show'.
4. Go to any page that contains header search box and click on 'Search
   the catalog'.
5. To the left of the search bar you should see a dropdown for branches.
6. This should be defaulted to 'All libraries'.
7. In the dropdown choose any branch and do a search and make sure it is
   correctly limiting to that branch.
8. Try changing to a different branch and doing another search. It
   should correcrly limit to that branch BUT it should also default back
   to 'All libraries' for the next search.
9. Try selecting 'All libraries' from the top of the dropdown and make
   sure it is correctly searching all branches.
10. Turn on the system pref 'IntranetCatalogSearchPulldown' and make
    sure it looks nice with both of those dropdowns and functions when
    you use limiters from both dropdowns.

Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 ...d_syspref_IntranetAddMastheadLibraryPulldown.pl | 14 ++++++++++++++
 installer/data/mysql/mandatory/sysprefs.sql        |  1 +
 .../prog/en/includes/catalogue-search-box.inc      |  8 ++++++++
 .../modules/admin/preferences/staff_interface.pref |  6 ++++++
 4 files changed, 29 insertions(+)
 create mode 100755 installer/data/mysql/atomicupdate/bug_30077_add_syspref_IntranetAddMastheadLibraryPulldown.pl

diff --git a/installer/data/mysql/atomicupdate/bug_30077_add_syspref_IntranetAddMastheadLibraryPulldown.pl b/installer/data/mysql/atomicupdate/bug_30077_add_syspref_IntranetAddMastheadLibraryPulldown.pl
new file mode 100755
index 0000000000..b4d18f9278
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_30077_add_syspref_IntranetAddMastheadLibraryPulldown.pl
@@ -0,0 +1,14 @@
+use Modern::Perl;
+
+return {
+    bug_number => "30077",
+    description => "Add the system preference IntranetAddMastheadLibraryPulldown",
+    up => sub {
+        my ($args) = @_;
+        my ($dbh, $out) = @$args{qw(dbh out)};
+        $dbh->do(q{
+            INSERT IGNORE INTO systempreferences (`variable`,`value`,`options`,`explanation`,`type`) VALUES ('IntranetAddMastheadLibraryPulldown','0','','Add a library select pulldown menu on the staff header search','YesNo ')
+        });
+        say $out "Finished adding system preference IntranetAddMastheadLibraryPulldown";
+    },
+};
diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
index 6a161abe72..457ce2f61d 100644
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ b/installer/data/mysql/mandatory/sysprefs.sql
@@ -282,6 +282,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('IndependentBranches','0',NULL,'If ON, increases security between libraries','YesNo'),
 ('IndependentBranchesPatronModifications','0', NULL, 'Show only modification request for the logged in branch','YesNo'),
 ('IndependentBranchesTransfers','0', NULL, 'Allow non-superlibrarians to transfer items between libraries','YesNo'),
+('IntranetAddMastheadLibraryPulldown','0', NULL, 'Add a library select pulldown menu on the staff header search','YesNo'),
 ('IntranetCatalogSearchPulldown','0', NULL, 'Show a search field pulldown for \"Search the catalog\" boxes','YesNo'),
 ('RecordedBooksClientSecret','','30','Client key for RecordedBooks integration','Free'),
 ('RecordedBooksDomain','','','RecordedBooks domain','Free'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
index 0bb0e63df6..a6ea0ab0b3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
@@ -1,3 +1,4 @@
+[% USE Branches %]
 [% IF ( CAN_user_catalogue ) %]
     <div id="catalog_search" class="residentsearch">
         <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
@@ -6,7 +7,14 @@
                     [% INCLUDE 'search_indexes.inc' $header_pulldown = 1 %]
                 [% END %]
             <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox" />
+            [% IF ( Koha.Preference('IntranetAddMastheadLibraryPulldown') ) %]
+                <select id="select_library" name="limit" style="margin-left:5px;">
+                    <option value="">All libraries</option>
+                    [% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all( selected => "" ) %]
+                </select>
+            [% END %]
             <input type="submit" value="Submit"  class="submit" />
+
         </form>
     </div>
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref
index 8fe46bfc79..32473520c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_interface.pref
@@ -187,6 +187,12 @@ Staff interface:
                  1: "Enable"
                  0: "Don't enable"
             - audio alerts for events defined in the <a href="/cgi-bin/koha/admin/audio_alerts.pl">audio alerts</a> section of administration.
+        -
+            - pref: IntranetAddMastheadLibraryPulldown
+              choices:
+                  1: Show
+                  0: "Don't show"
+            - a library select pulldown menu on the staff header search.
         -
             - pref: IntranetCatalogSearchPulldown
               choices: