From 7925b98ee8d2f1e456cf6459e14197a50b20cf09 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Mon, 8 Apr 2013 21:20:51 +1200
Subject: [PATCH] Bug 9591 : Set Library changes after viewing Holds Queue >>
 reserves item

To test
1. Log in to the staff client. Note your logged in library.
2. Navigate to Circulation -> Holds queue.
3. Select a holds queue report for a library other than your own.
4. From the holds queue report page, click the "Check out" tab and
   enter the card number of a patron who has holds.
5. On the circulation page for that patron, click the "Holds" tab.
6. Click one of the titles in the list of holds.

Your logged in branch will now match the library you chose for the
holds queue report.

Alternate sequence:

4. From the holds queue report page, click the "Check out" tab and
   do a non-exact search (search which will return more than one result)
   for a patron who has holds.
5. Choose the correct patron from the list of results.

Your logged in branch will now match the library you chose for
the holds queue report.

Apply the patch and repeat, this time it should not change your logged
in branch

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Weird bug, the patch works for me.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch. All tests and QA script pass.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 circ/view_holdsqueue.pl                                         | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 4b514239a4..7e81d24b57 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -53,7 +53,7 @@ my $itemtypeslimit = $params->{'itemtypeslimit'};
 if ( $run_report ) {
     my $items = GetHoldsQueueItems($branchlimit, $itemtypeslimit);
     $template->param(
-        branch     => $branchlimit,
+        branchlimit     => $branchlimit,
         total      => scalar @$items,
         itemsloop  => $items,
         run_report => $run_report,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index d8d8536445..8fb8e75035 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -34,7 +34,7 @@ $(document).ready(function() {
 [% IF ( run_report ) %]
     [% IF ( total ) %]
         <div class="results">[% total %] items found for
-            [% IF ( branch ) %][% branch %][% ELSE %]ALL libraries[% END %]
+            [% IF ( branchlimit ) %][% branchlimit %][% ELSE %]ALL libraries[% END %]
         </div>
     [% ELSE %]
         <div class="dialog message">No items found.</div>
-- 
2.39.5