From 2574391dfd7afeac55a2a15d9a80be99daf90b3f Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Mon, 8 Apr 2013 21:20:51 +1200 Subject: [PATCH 1/2] 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 Weird bug, the patch works for me. Signed-off-by: Katrin Fischer Good catch. All tests and QA script pass. Signed-off-by: Chris Cormack --- 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 cf529f04aa..c2bd8365c9 100755 --- a/circ/view_holdsqueue.pl +++ b/circ/view_holdsqueue.pl @@ -54,7 +54,7 @@ if ( $run_report ) { # XXX GetHoldsQueueItems() does not support $itemtypeslimit! 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 aefd8d99d6..40cc6e1e0d 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 @@ -42,7 +42,7 @@ $(document).ready(function() { [% IF ( run_report ) %] [% IF ( total ) %]
[% total %] items found for - [% IF ( branch ) %][% branch %][% ELSE %]ALL libraries[% END %] + [% IF ( branchlimit ) %][% branchlimit %][% ELSE %]ALL libraries[% END %]
[% ELSE %]
No items found.
From 1dc63ee38be10f0c13e261de3323b329449fa0ca Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 10 May 2013 09:50:51 -0400 Subject: [PATCH 2/2] Bug 9679 - can't place hold from cart in CCSR When the CCSR theme is enabled, selecting items in the cart and clicking "place hold" triggers a JavaScript error and fails. This patch adds a function missing from the CCSR version of basket.js. To test, apply the patch and clear your browser cache. - Enable the CCSR theme and put items into the OPAC cart. - Open the cart, select one or more items, and click "place hold." The cart should automatically close and the main window should redirect to the holds screen showing your selections. Signed-off-by: Nicole C. Engard All test passed Signed-off-by: Katrin Fischer Confirmed patch fixes the problem described. All tests and QA script pass, JavaScript only change. No strings involved, save for inclusion in 3.12. Signed-off-by: Jared Camins-Esakov (cherry picked from commit d0f93e67726ed242e1124d36ed00d1a4a3645701) Signed-off-by: Jared Camins-Esakov (cherry picked from commit 2b0ba53cad029941c8ecb21825cee5c904e89529) Signed-off-by: Chris Cormack --- koha-tmpl/opac-tmpl/ccsr/en/js/basket.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/koha-tmpl/opac-tmpl/ccsr/en/js/basket.js b/koha-tmpl/opac-tmpl/ccsr/en/js/basket.js index 115880f2f4..adc0c8f705 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/js/basket.js +++ b/koha-tmpl/opac-tmpl/ccsr/en/js/basket.js @@ -397,6 +397,16 @@ function showLess() { document.location = loc; } +function holdSel() { + var items = document.getElementById('records').value; + if (items) { + parent.opener.document.location = "/cgi-bin/koha/opac-reserve.pl?biblionumbers=" + items; + window.close(); + } else { + alert(MSG_NO_RECORD_SELECTED); + } +} + function updateBasket(updated_value,target) { if(target){ target.$('#basketcount').html(""+updated_value+"");