From koha-patches-bounces@lists.koha-community.org Tue May 17 09:27:24 2011 Return-Path: <koha-patches-bounces@lists.koha-community.org> X-Original-To: chrisc@catalyst.net.nz Delivered-To: chrisc@catalyst.net.nz Received: from localhost (localhost [127.0.0.1]) by mail.catalyst.net.nz (Postfix) with ESMTP id 765383294F; Tue, 17 May 2011 09:27:24 +1200 (NZST) X-Virus-Scanned: Debian amavisd-new at catalyst.net.nz Received: from mail.catalyst.net.nz ([127.0.0.1]) by localhost (bertrand.catalyst.net.nz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3kZF657E6ycj; Tue, 17 May 2011 09:27:23 +1200 (NZST) Received: from eliot.biblibre.com (eliot.biblibre.com [188.165.204.78]) by mail.catalyst.net.nz (Postfix) with ESMTPS id CE09B328D9; Tue, 17 May 2011 09:27:22 +1200 (NZST) Received: from eliot.biblibre.com (localhost.localdomain [127.0.0.1]) by eliot.biblibre.com (Postfix) with ESMTP id 851F946E07; Mon, 16 May 2011 23:27:20 +0200 (CEST) X-Original-To: koha-patches@lists.koha-community.org Delivered-To: koha-patches_lists.koha-community.org@eliot.biblibre.com Received: from mail-px0-f172.google.com (mail-px0-f172.google.com [209.85.212.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by eliot.biblibre.com (Postfix) with ESMTPS id 193044690F for <koha-patches@lists.koha-community.org>; Mon, 16 May 2011 23:27:17 +0200 (CEST) Received: by pxi6 with SMTP id 6so4123355pxi.17 for <koha-patches@lists.koha-community.org>; Mon, 16 May 2011 14:27:15 -0700 (PDT) Received: by 10.68.59.169 with SMTP id a9mr8422278pbr.60.1305581235618; Mon, 16 May 2011 14:27:15 -0700 (PDT) Received: from ubuntu (203-97-214-51.cable.telstraclear.net [203.97.214.51]) by mx.google.com with ESMTPS id n6sm168042pbc.57.2011.05.16.14.27.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 16 May 2011 14:27:15 -0700 (PDT) Received: from chris by ubuntu with local (Exim 4.74) (envelope-from <chris@bigballofwax.co.nz>) id 1QM5Gb-00065n-LK; Tue, 17 May 2011 09:23:53 +1200 From: Chris Cormack <chris@bigballofwax.co.nz> To: koha-patches@lists.koha-community.org Date: Tue, 17 May 2011 09:23:52 +1200 Message-Id: <1305581032-23384-1-git-send-email-chris@bigballofwax.co.nz> X-Mailer: git-send-email 1.7.4.1 Subject: [Koha-patches] [PATCH] Bug 6347 - Fix for itemlevel holds in OPAC X-BeenThere: koha-patches@lists.koha-community.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Patches submitted to Koha <koha-patches.lists.koha-community.org> List-Unsubscribe: <http://lists.koha-community.org/cgi-bin/mailman/options/koha-patches>, <mailto:koha-patches-request@lists.koha-community.org?subject=unsubscribe> List-Archive: </pipermail/koha-patches> List-Post: <mailto:koha-patches@lists.koha-community.org> List-Help: <mailto:koha-patches-request@lists.koha-community.org?subject=help> List-Subscribe: <http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches>, <mailto:koha-patches-request@lists.koha-community.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: koha-patches-bounces@lists.koha-community.org Errors-To: koha-patches-bounces@lists.koha-community.org Content-Length: 1955 --- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 5 ++++- opac/opac-reserve.pl | 4 ++-- 2 files changed, 6 insertions(+), 3 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 bc46b28..012cd0b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -371,7 +371,10 @@ <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear Date</a></p> </td>[% END %] - [% IF ( bibitemloo.holdable ) %][% IF ( OPACItemHolds ) %] + [% IF ( bibitemloo.holdable ) %] + <!-- HOLD ABLE --> + [% IF ( OPACItemHolds ) %] + <! -- ITEM HOLDS --> <td class="place_on_type" style="display:none"> <table> <tr> diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index d50480a..0ddb9d3 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -478,10 +478,10 @@ if ( $numBibsAvailable == 0 || !$anyholdable) { } my $itemTableColspan = 5; -if (!$template->param('OPACItemHolds')) { +if (! $template->{VARS}->{'OPACItemHolds'}) { $itemTableColspan--; } -if ($template->param('singleBranchMode')) { +if (! $template->{VARS}->{'singleBranchMode'}) { $itemTableColspan--; } $template->param(itemtable_colspan => $itemTableColspan); -- 1.7.4.1 _______________________________________________ Koha-patches mailing list Koha-patches@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/