From 01a428f7cdd91d2352543cfb83750af1a24fda0f Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Tue, 17 Feb 2015 17:09:06 +0100 Subject: [PATCH] =?utf8?q?SL::DB::CustomVariable:=20value,=20value=5Fas=5F?= =?utf8?q?text=20f=C3=BCr=20Typ=20'date/timestamp'=20und=20ungesetzt=20gef?= =?utf8?q?ixt?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/DB/CustomVariable.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm index 03fd5cad5..e48c1d829 100644 --- a/SL/DB/CustomVariable.pm +++ b/SL/DB/CustomVariable.pm @@ -76,7 +76,7 @@ sub value { my $id = int($self->number_value); return $id ? SL::DB::Part->new(id => $id)->load() : undef; } elsif ( $type eq 'date' ) { - return $self->timestamp_value->clone->truncate(to => 'day'); + return $self->timestamp_value ? $self->timestamp_value->clone->truncate(to => 'day') : undef; } goto &text_value; # text, textfield and select @@ -92,6 +92,7 @@ sub value_as_text { if ($type eq 'bool') { return $self->bool_value ? $::locale->text('Yes') : $::locale->text('No'); } elsif ($type =~ m{^(?:timestamp|date)}) { + return '' if !$self->timestamp_value; return $::locale->reformat_date( { dateformat => 'yy-mm-dd' }, $self->timestamp_value->ymd, $::myconfig{dateformat}); } elsif ($type eq 'number') { return $::form->format_amount(\%::myconfig, $self->number_value, $cfg->processed_options->{PRECISION}); -- 2.20.1