From c2a6356d585b3dd202de16d7e363ffd873926b95 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Fri, 10 Nov 2023 14:54:00 +0000
Subject: [PATCH] Bug 35306: Fix Expired holds when modding request

To test:
1. Make some holds on a record and make sure some are set to expired.
2. Go to to reserve/request.pl?biblionumber=X for the biblionumber
3. Try updating something besides the expiration date. i.e. Pickup library
4. Click Update hold(s)
5. Notice the expirated holds have lost their expiration date.
6. APPLY PATCH
7. Try steps 2-4 again, this time the expiration date shold be retained.
8. Make sure Table settings still work and you can properly hide columns.
9. The hold expiration date should be hide-able.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 admin/columns_settings.yml                               | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 5a36f9b1d4..dd6396671f 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1696,6 +1696,8 @@ modules:
               columnname: date
             -
               columnname: expiration
+              cannot_be_toggled: 1
+              cannot_be_modified: 1
             -
               columnname: pickup_library
               cannot_be_toggled: 1
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 6e70ced95e..f443a7e197 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
@@ -127,7 +127,12 @@
                     [% END %]
                 </td>
                 <td>
-                    <input type="text" class="flatpickr" data-flatpickr-futuredate="true" value="[% hold.expirationdate | html %]" size="10" name="expirationdate" />
+                    [% UNLESS hold.expired %]
+                        <input type="text" class="flatpickr" data-flatpickr-futuredate="true" value="[% hold.expirationdate | html %]" size="10" name="expirationdate" />
+                    [% ELSE %]
+                        <span class="expiredon"><label>Expired:</label> [% hold.expirationdate | $KohaDates %]</span>
+                        <input type="hidden" value="[% hold.expirationdate | html %]"  name="expirationdate" />
+                    [% END %]
                 </td>
                 <td>
                     [%- IF ( hold.found ) -%]
-- 
2.39.5