From aa0397cd6c28e79880c27731d4caa836b0538ea9 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 4 Jan 2023 10:59:55 +0000 Subject: [PATCH] Bug 32503: Use first cancellation for date ordering Signed-off-by: Lucas Gass Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 37530b445fe3abad2861c02cc191bb6095f218c0) Signed-off-by: Matt Blenkinsop --- .../prog/en/includes/waiting_holds.inc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index 8440476f68..e6caa50f4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -8,7 +8,7 @@ Waiting since Date hold placed [% IF table_name == 'holdscr' %] - Date cancellation requested + Date cancellation requested [% END %] Expiration date Title @@ -29,11 +29,19 @@ [% reserveloo.waitingdate | $KohaDates %] [% reserveloo.reservedate | $KohaDates %] [% IF table_name == 'holdscr' %] - - [% FOREACH cancellation_request IN reserveloo.cancellation_requests %] - [% cancellation_request.creation_date | $KohaDates %] + [% IF reserveloo.cancellation_requests.count %] + [% FOREACH cancellation_request IN reserveloo.cancellation_requests %] + [% IF loop.first %] + + [% END %] + [% cancellation_request.creation_date | $KohaDates %] + [% IF loop.last %] + + [% END %] + [% END %] + [% ELSE %] + [% END %] - [% END %] [% reserveloo.expirationdate | $KohaDates %] -- 2.39.5