From 90575b64d5c4ed63e1eeded043865796bbcde244 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Wed, 3 May 2017 15:21:40 -0400
Subject: [PATCH] Bug 18534 - When IndependentBranches is enabled the pickup
 location displayed incorrectly on request.pl

To recreate:
1 - Place a hold for pickup at Midway
2 - Enable independentbranches
3 - Login to staff interface as admin without superlibrarian status from
a different branch
4 - View the holds for the title you placed a hold on
5 - The hold placed in step 1 should show a dropdown with current branch
as pickup location, current branch is the only in that dropdown
6 - Verify it displays correctly for superlibrarian
7 - Apply patch
8 - The correct pickup location should show and not be editable
9 - Verify it is a dropdown

Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/modules/reserve/request.tt   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 706cb6d04a..27dd2de440 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -796,9 +796,13 @@ function checkMultiHold() {
             Item being transferred to <b> [% reserveloo.wbrname %]</b> <input type="hidden" name="pickup" value="[% reserveloo.wbrcode %]" />
          [% END %]
     [% ELSE %]
-        <select name="pickup">
-            [% PROCESS options_for_libraries libraries => Branches.all( selected => reserveloo.branchcode ) %]
-        </select>
+        [% IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 %]
+            [% Branches.GetName(reserveloo.branchcode) %] <input type="hidden" name="pickup" value="[% reserveloo.branchcode %]" />
+        [% ELSE %]
+            <select name="pickup">
+                [% PROCESS options_for_libraries libraries => Branches.all( selected => reserveloo.branchcode ) %]
+            </select>
+        [% END %]
     [% END %]
         </td>
         <td>
-- 
2.39.5