From 881c687fea62b7819b6c4a09769c42e96a97f4cd Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Tue, 21 Sep 2021 15:15:15 +0000
Subject: [PATCH] Bug 29073: Use 0 and 1 as values for
 DefaultHoldExpirationdate

DefaultHldexpirationDate is set in the pref screen to 'yes/no'

The code checks if the preference is 'true', 'no' is true

We should instead use 1/0

To test:
0 - Have a fresh devbox
1 - With syspref disabled, place a hold
2 - Note no expiration date set
3 - Enable the preference
4 - Place a hold and note the expiration date is set, good
5 - Disable the pref
6 - Place a hold and note the expiration date is set, bad
7 - Apply patch
8 - Update database
9 - Repeat 1-8, date not set when pref disabled

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 installer/data/mysql/atomicupdate/bug_29073.pl  | 17 +++++++++++++++++
 .../modules/admin/preferences/circulation.pref  |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100755 installer/data/mysql/atomicupdate/bug_29073.pl

diff --git a/installer/data/mysql/atomicupdate/bug_29073.pl b/installer/data/mysql/atomicupdate/bug_29073.pl
new file mode 100755
index 0000000000..ef06a3e8f0
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_29073.pl
@@ -0,0 +1,17 @@
+use Modern::Perl;
+
+return {
+    bug_number => "29073",
+    description => "Make DefaultHoldExpirationdate use 1/0 values",
+    up => sub {
+        my ($args) = @_;
+        my ($dbh, $out) = @$args{qw(dbh out)};
+        # Do you stuffs here
+        $dbh->do(q{
+            UPDATE systempreferences SET value = IF(value = 'yes',1,0)
+            WHERE variable = 'DefaultHoldExpirationdate';
+        });
+        # Print useful stuff here
+        say $out "DefaultHoldExpirationdate values updated";
+    },
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index d7d36d1bc7..1923ffeadc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -900,8 +900,8 @@ Circulation:
             - pref: DefaultHoldExpirationdate
               default: 0
               choices:
-                  yes: Set
-                  no: Don't set
+                  1: Set
+                  0: Don't set
             - default expiration date for holds automatically.
             - If enabled, set expiration date
             - pref: DefaultHoldExpirationdatePeriod
-- 
2.39.5