From 4d5460ec854fe46530deddb6ca2cc8cb72e9b14f Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 17 May 2011 09:23:52 +1200 Subject: [PATCH] Bug 6347 - Fix for itemlevel holds in OPAC Edits by Owen: - More variable scope corrections - Minor markup and style tweak - Table column span correction Signed-off-by: Katrin Fischer - Item level holds can be placed and hold saved - Table and layout are ok now Signed-off-by: Chris Cormack (cherry picked from commit 481ffe7474fa9d0a972dd4be70ac2cad62e315a6) Signed-off-by: Chris Nighswonger --- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 29 +++++++++---------- opac/opac-reserve.pl | 6 ++-- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt index bfcbf4aab0..52dbf1cc2e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -152,6 +152,7 @@ }); // ]]> + @@ -373,11 +374,13 @@ Clear Date

[% END %] - [% IF ( bibitemloo.holdable ) %][% IF ( OPACItemHolds ) %] + [% IF ( bibitemloo.holdable ) %] + + [% IF ( OPACItemHolds ) %] + - - - - - - - -
+
    +
  • [% UNLESS ( bibitemloo.holdable ) %] [% END %] -
+ +
  • [% UNLESS ( bibitemloo.holdable ) %] [% END %] -
    • + + [% END %][% END %] @@ -442,9 +442,8 @@ [% IF ( OPACItemHolds ) %] [% IF ( bibitemloo.holdable ) %] - - - +   + @@ -468,7 +467,7 @@
    Select a specific copy:
    [% IF ( itemLoo.available ) %] - [% ELSE %] diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index d50480aef3..a92a976003 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -477,11 +477,11 @@ if ( $numBibsAvailable == 0 || !$anyholdable) { $template->param( none_available => 1 ); } -my $itemTableColspan = 5; -if (!$template->param('OPACItemHolds')) { +my $itemTableColspan = 7; +if (! $template->{VARS}->{'OPACItemHolds'}) { $itemTableColspan--; } -if ($template->param('singleBranchMode')) { +if (! $template->{VARS}->{'singleBranchMode'}) { $itemTableColspan--; } $template->param(itemtable_colspan => $itemTableColspan); -- 2.39.5