From d9b29d5b11fd6bb6d5b24553d43953284bdb7d24 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Fri, 7 Jul 2023 21:58:55 +0000
Subject: [PATCH] Bug 34233: Move select2 include out of patron-search.inc

1. Apply patch
2. Place a hold and make sure the patron pickup locations are
   populating correctly again/
3. Work through the test plan on Bug 28726 to make sure it still works.
4. Enable ArticleRequests, make sure you can still do a patron search
   there.
5. Do a patron search from members.tt, make sure that still works.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c92c893c12ea7fdc37c66916ee3f54ff666d1474)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 93877a3f8f3ca05fded88bbf47ec0d5a929cfa40)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc      | 1 -
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt       | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt       | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 9d5af1cb01..a00a7b6cb1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -211,7 +211,6 @@
         <script>console.log("Wrong call of patron_search_js - missing redirect_url");</script>
     [% END %]
 
-    [% INCLUDE 'select2.inc' %]
     <script>
         let categories = [% To.json(categories) | $raw %].map(e => {
             e['_id'] = e.categorycode.toLowerCase();
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
index 0aced44773..7b27c73a35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/request-article.tt
@@ -353,6 +353,7 @@
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
+    [% INCLUDE 'select2.inc' %]
 
     <script>
         $('#current-article-requests').ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 6d25e44e93..99b9eab095 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -136,6 +136,7 @@
     [% INCLUDE 'columns_settings.inc' %]
     [% INCLUDE 'str/members-menu.inc' %]
     [% Asset.js("js/members-menu.js") | $raw %]
+    [% INCLUDE 'select2.inc' %]
     <script>
         function showPatronSelections( number ){
             $("#patron_search_selected").show().find("span").text(_("Patrons selected: " + number ) );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
index 6146eebe5c..67f056ddb8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tt
@@ -42,6 +42,7 @@
 </div>
 
 [% MACRO jsinclude BLOCK %]
+[% INCLUDE 'select2.inc' %]
 <script>
     $(document).ready(function() {
         $("#select_all").on("click",function(e){
-- 
2.39.5