Bug 20948: Only display item-level hold info if first hold

On the item list of the catalogue detail page we display next item-level
hold info even if it is not the next hold. That leads to confusion as it
will not necessarily be the accurate info.

This patch makes the following changes:
- Display the item-level hold only if it is the next hold (priority ==
1)
- Display "There is an item level hold on this item (priority=X)"
if there is at least 1 item-level hold placed on this item

Test plan:
- Place several next available holds on a single item record
- Place an item level hold on the item
- Go the the biblio detail page
=> Without this patch, the item will show the item level hold
=> With the patch you see "There is an item level hold on this item"
- Check the item in, confirm the hold
=> No changes, the item will show the waiting hold info
- Cancel all the holds except the item-level one
=> No changes, the item will how the item-level one

Signed-off-by: Lisette Scheer <lisetteslatah@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit 6998a32ca4e29313a02b020d9e36c0c75f129fb1)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit e46289d12c99f3fabf0d00cdd71ec8f921d69be2)
Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 9668422..4ef27e0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -488,10 +488,12 @@
                         [% IF hold %]
                             [% IF hold.waitingdate %]
                                 Waiting at [% Branches.GetName( hold.branchcode ) | html %] since [% hold.waitingdate | $KohaDates %].
-                            [% ELSE %]
+                            [% ELSIF hold.priority == 1 %]
                                 Item-level hold (placed [% hold.reservedate | $KohaDates %]) for delivery at [% Branches.GetName( hold.branchcode ) | html %].
+                            [% ELSE %]
+                                There is an item level hold on this item (priority = [% hold.priority %]).
                             [% END %]
-                            [% IF ( canreservefromotherbranches ) %]
+                            [% IF canreservefromotherbranches AND ( hold.waitingdate OR hold.priority == 1 ) %]
                                 Hold for:
                                 [% INCLUDE 'patron-title.inc' patron=hold.borrower hide_patron_infos_if_needed=1 %]
                             [% END %]