Attachment 129093 Details for Bug 21729 – Bug 21729: Simplify non-existent expiration date

[patch] Bug 21729: Simplify non-existent expiration date

Bug-21729-Simplify-non-existent-expiration-date.patch (text/plain), 1.50 KB, created by Martin Renvoize (ashimema) on 2022-01-06 14:12:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-01-06 14:12:59 UTC

Size: 1.50 KB

patch

obsolete

>From de97a63712f594b868060c8c3f1c3e96c0574083 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 14 Oct 2021 08:38:02 +0200
>Subject: [PATCH] Bug 21729: Simplify non-existent expiration date
>
>No change in behaviour expected by this patch.
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>Signed-off-by: Florian Bontemps <florian.bontemps@biblibre.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> Koha/Hold.pm | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
>diff --git a/Koha/Hold.pm b/Koha/Hold.pm
>index 33ab06f839..c88782bd73 100644
>--- a/Koha/Hold.pm
>+++ b/Koha/Hold.pm
>@@ -596,8 +596,7 @@ sub store {
> 
>         if (
>             C4::Context->preference('DefaultHoldExpirationdate')
>-            and ( not defined $self->expirationdate
>-                or $self->expirationdate eq '' )
>+                && !$self->expirationdate
>           )
>         {
>             $self->_set_default_expirationdate;
>@@ -611,9 +610,7 @@ sub store {
>         if ( exists $updated_columns{reservedate} ) {
>             if (
>                 C4::Context->preference('DefaultHoldExpirationdate')
>-                and ( not exists $updated_columns{expirationdate}
>-                    or exists $updated_columns{expirationdate}
>-                    and $updated_columns{expirationdate} eq '' )
>+                && ! exists $updated_columns{expirationdate}
>               )
>             {
>                 $self->_set_default_expirationdate;
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 21729: 126160 | 126161 | 126162 | 126203 | 126258 | 127797 | 127798 | 127799 | 127800 | 127867 | 127868 | 127869 | 127870 | 127877 | 127878 | 127879 | 127880 | 128761 | 129090 | 129091 | 129092 | 129093 | 129094