From 8039c4929597723591d9d6c2c9d0b8a83799d143 Mon Sep 17 00:00:00 2001
From: David Cook <dcook@prosentient.com.au>
Date: Tue, 10 Oct 2017 12:05:16 +1100
Subject: [PATCH] Bug 18884 - Advanced search on staff client, Availability
 limit not properly limiting

Bug 15758 accidentally removed the branch: prefix off the
individual library limits on the advanced search in the staff client.

This patch adds an optional prefix to the html_helpers.inc file,
so that advsearch.tt can provide the required "branch:" prefix.

_TEST PLAN_

Before applying:
0) Make sure you have branches in your Koha (e.g. select all sample data
via web installer initially)
1) View the source on the staff client advanced search, and note that
the "branch:" prefix is missing from the individual library limit:

<option value="CPL">Centerville</option>

3) Apply the patch
4) Refresh the advanced search page
5) View the source on the staff client advanced search, and note that
the "branch:" prefix now appears for the individual library limit:

<option value="branch:CPL">Centerville</option>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc      | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
index 089680f25a..01027204c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -1,9 +1,9 @@
 [% BLOCK options_for_libraries %]
     [% FOREACH l IN libraries %]
         [% IF l.selected %]
-            <option value="[% l.branchcode | html %]" selected="selected">[% l.branchname %]</option>
+            <option value="[% prefix %][% l.branchcode | html %]" selected="selected">[% l.branchname %]</option>
         [% ELSE %]
-            <option value="[% l.branchcode | html %]">[% l.branchname |html %]</option>
+            <option value="[% prefix %][% l.branchcode | html %]">[% l.branchname |html %]</option>
         [% END%]
     [% END %]
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index 8425f591fb..b9f00d0902 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -239,7 +239,7 @@
         <p><label for="branchloop">Individual libraries:</label><select name="limit" id="branchloop">
         <option value="">All libraries</option>
         [%# FIXME Should not we filter the libraries displayed? %]
-        [% PROCESS options_for_libraries libraries => Branches.all( selected => selected_branchcode, unfiltered => 1 ) %]
+        [% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all( selected => selected_branchcode, unfiltered => 1 ) %]
         </select></p>
     <!-- <input type="hidden" name="limit" value="branch: MAIN" /> -->
         [% IF ( searchdomainloop ) %]
-- 
2.12.3