From 33465f2f7ae0d00775a207b793037fc15b89177d Mon Sep 17 00:00:00 2001 From: Emily Lamancusa Date: Sun, 24 Mar 2024 15:58:47 -0400 Subject: [PATCH] Bug 35559: Revert changes from bug 34634 This reverts commit fad3af0005c3a4234634ee477fafc85902540843 Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc | 7 +------ reserve/request.pl | 2 -- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index f6da101a4d..e939247f4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -127,12 +127,7 @@ [% END %] - [% UNLESS hold.expired %] - - [% ELSE %] - [% hold.expirationdate | $KohaDates %] - - [% END %] + [%- IF ( hold.found ) -%] diff --git a/reserve/request.pl b/reserve/request.pl index 55495d8f15..5d0887764d 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -636,8 +636,6 @@ if ( ( $findborrower && $borrowernumber_hold || $findclub && $club_hold ) } } $reserve{'expirationdate'} = $res->expirationdate; - $reserve{'expired'} = 1 - if ( DateTime->compare( dt_from_string( $res->expirationdate ), dt_from_string() ) == -1 ); $reserve{'date'} = $res->reservedate; $reserve{'borrowernumber'} = $res->borrowernumber(); $reserve{'biblionumber'} = $res->biblionumber(); -- 2.39.5