From 5df9f7e712f598eefa7711403c3fe4a25fef3f15 Mon Sep 17 00:00:00 2001 From: Nahuel ANGELINETTI Date: Fri, 24 Jul 2009 16:01:48 +0200 Subject: [PATCH] (bug #2812) fix holds cancel in OPAC Content-Type: text/plain; charset="utf-8" This fix the user ability to cancel holds in OPAC. At the moment, a user can cancel all his holds, but in fact, only items that are not in transfert or waiting to be checked out can be cancelled by the user. --- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 10 +++++++--- opac/opac-user.pl | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl index 36e78e1..40e3187 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl @@ -348,9 +348,13 @@ $.tablesorter.addParser({ -
- " /> -
+ +
+ " /> +
+ +   + diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 5b997c7..af03bfe 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -241,6 +241,10 @@ foreach my $res (@reserves) { push @waiting, $res; $wcount++; } + # can be cancelled + #$res->{'cancelable'} = 1 if ($res->{'wait'} && $res->{'atdestination'} && $res->{'found'} ne "1"); + $res->{'cancelable'} = 1 if ($res->{wait} and not $res->{found}) or (not $res->{wait} and not $res->{intransit}); + } $template->param( WAITING => \@waiting ); -- 1.6.0.4