From 0da1c854b58b43dfea40f873a33b1918dd39dc7e 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
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Patch applies and functions as described.

Signed-off-by: Dilan Johnpullé <dilan@calyx.net.au>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 48be40d1bfaf13a70b6bf4918e885d9158e25f66)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit fa0608bc4c2e66628285f7434749df0a0e690e8b)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../prog/en/includes/html_helpers.inc              |    4 ++--
 .../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 089680f..0102720 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 c6bdc23..095c908 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -254,7 +254,7 @@
         <p><label for="branchloop">Individual libraries:</label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>
         <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 ) %]
-- 
1.7.2.5