From 6325f4cc83a6422f6ce7c2922b9077862efa50c9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 9 Apr 2018 15:08:42 -0300 Subject: [PATCH] Bug 19287: Do not display buttons for biblio level holds Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- circ/pendingreserves.pl | 2 +- .../prog/en/modules/circ/pendingreserves.tt | 26 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index 6f47a31572..5e6418b22c 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -177,7 +177,7 @@ my $strsth = ORDER BY items.itemnumber SEPARATOR '|') l_holdingbranch, reserves.biblionumber, reserves.branchcode as l_branch, - items.itemnumber, + reserves.itemnumber, items.holdingbranch, items.homebranch, GROUP_CONCAT(DISTINCT items.itype diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt index f56bd817d3..ccac35fd8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -36,7 +36,7 @@ [% CASE 'hold_cancelled' %] The hold has been correctly cancelled. [% CASE 'hold_placed_at_biblio_level' %] - The hold has been placed at biblio level. It is not possible to mark it as lost. + The hold has been placed on biblio level. It is not possible to determine the item to mark as lost. [% CASE %] [% m.code %] [% END %] @@ -120,16 +120,20 @@ [% IF Koha.Preference('CanMarkHoldsToPullAsLost') != 'do_not_allow' %] -
- - [% IF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow' %] - - - [% ELSIF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow_and_notify' %] - - - [% END %] -
+ [% IF reserveloo.itemnumber %] +
+ + [% IF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow' %] + + + [% ELSIF Koha.Preference('CanMarkHoldsToPullAsLost') == 'allow_and_notify' %] + + + [% END %] +
+ [% ELSE %] + Biblio level hold. + [% END %] [% END %] [% END %] -- 2.39.5