Attachment 43169 Details for Bug 14949 – Bug 14949 - (followup) Fix regression with hard due date

[patch] Bug 14949 - (followup) Fix regression with hard due date

Bug-14949---followup-Fix-regression-with-hard-due-.patch (text/plain), 1.56 KB, created by Marc Véron on 2015-10-06 13:20:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2015-10-06 13:20:57 UTC

Size: 1.56 KB

patch

obsolete

>From 12a7fb190cf76a890010e8b8862def85282cba48 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Tue, 6 Oct 2015 15:06:25 +0200
>Subject: [PATCH] Bug 14949 - (followup) Fix regression with hard due date
>
>This patch fixes the regresseion as described in comment #3
>
>To test:
>
>- Go on smart-rules.pl and edit a line. Do not define a Hard due date, save.
>  The value is "None defined".
>
>- Edit the line, do not change anything and save.
>  The value should be "None defined"
>
>- Edit the line, define a hard due date, save.
>  The date should display as expected.
>
>- Edit the line agein, remove the hard due date, save.
>  The value should be "None defined"
>---
> admin/smart-rules.pl |    3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
>index aea9c50..8e0188c 100755
>--- a/admin/smart-rules.pl
>+++ b/admin/smart-rules.pl
>@@ -122,7 +122,8 @@ elsif ($op eq 'add') {
>     $maxissueqty = undef if $maxissueqty !~ /^\d+/;
>     my $issuelength  = $input->param('issuelength');
>     my $lengthunit  = $input->param('lengthunit');
>-    my $hardduedate = eval { dt_from_string( $input->param('hardduedate') ) };
>+    my $hardduedate = $input->param('hardduedate');
>+    $hardduedate = eval { dt_from_string( $input->param('hardduedate') ) } if ( $hardduedate );
>     $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
>     my $hardduedatecompare = $input->param('hardduedatecompare');
>     my $rentaldiscount = $input->param('rentaldiscount');
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 14949: 43094 | 43101 | 43169 | 43409 | 43884 | 43885 | 43934 | 43935 | 43936