CustomVariables: Zuweisen von zu parsenden Inhalten

[kivitendo-erp.git] / SL / DB / CustomVariable.pm

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index d9b154c..08dd663 100644 (file)
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -20,9 +20,11 @@ sub unparsed_value {
 sub _ensure_config {
   my ($self) = @_;
 
-  return $self->config if  $self->config;
+  return $self->config if  defined $self->{config};
   return undef         if !defined $self->config_id;
-  $self->config( SL::DB::CustomVariableConfig->new(id => $self->config_id)->load );
+
+  no warnings 'once';
+  return $::request->cache('config_by_id')->{$self->config_id} //= SL::DB::CustomVariableConfig->new(id => $self->config_id)->load;
 }
 
 sub parse_value {
@@ -33,10 +35,14 @@ sub parse_value {
 
   my $unparsed = delete $self->{__unparsed_value};
 
-  if ($type =~ m{^(?:customer|vendor|part|bool|number)}) {
+  if ($type =~ m{^(?:customer|vendor|part|number)}) {
     return $self->number_value(defined($unparsed) ? $unparsed * 1 : undef);
   }
 
+  if ($type =~ m{^(?:bool)}) {
+    return $self->bool_value(defined($unparsed) ? !!$unparsed : undef);
+  }
+
   if ($type =~ m{^(?:date|timestamp)}) {
     return $self->timestamp_value(defined($unparsed) ? DateTime->from_kivitendo($unparsed) : undef);
   }
@@ -52,6 +58,7 @@ sub value {
   if (scalar(@_) > 1) {
     $self->unparsed_value($_[1]);
     $self->parse_value;
+    @_ = ($self);
   }
 
   goto &bool_value      if $type eq 'bool';
@@ -62,54 +69,46 @@ sub value {
     require SL::DB::Customer;
 
     my $id = int($self->number_value);
-    return $id ? SL::DB::Customer->new(id => $id)->load() : 0;
+    return $id ? SL::DB::Customer->new(id => $id)->load() : undef;
   } elsif ( $type eq 'vendor' ) {
     require SL::DB::Vendor;
 
     my $id = int($self->number_value);
-    return $id ? SL::DB::Vendor->new(id => $id)->load() : 0;
+    return $id ? SL::DB::Vendor->new(id => $id)->load() : undef;
   } elsif ( $type eq 'part' ) {
     require SL::DB::Part;
 
     my $id = int($self->number_value);
-    return $id ? SL::DB::Part->new(id => $id)->load() : 0;
+    return $id ? SL::DB::Part->new(id => $id)->load() : undef;
+  } elsif ( $type eq 'date' ) {
+    return $self->timestamp_value ? $self->timestamp_value->clone->truncate(to => 'day') : undef;
   }
 
-  goto &text_value; # text, textfield, date and select
+  goto &text_value; # text, textfield and select
 }
 
 sub value_as_text {
   my $self = $_[0];
-  my $type = $self->config->type;
+  my $cfg  = $self->_ensure_config;
+  my $type = $cfg->type;
 
   die 'not an accessor' if @_ > 1;
 
-  if ($type eq 'boolean') {
+  if ($type eq 'bool') {
     return $self->bool_value ? $::locale->text('Yes') : $::locale->text('No');
-  } elsif ($type eq 'timestamp') {
+  } 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, $self->config->processed_options->{PRECISION});
-  } elsif ( $type eq 'customer' ) {
-    require SL::DB::Customer;
-
-    my $id = int($self->number_value);
-    my $customer =  $id ? SL::DB::Customer->new(id => $id)->load() : 0;
-    return $customer ? $customer->name : '';
-  } elsif ( $type eq 'vendor' ) {
-    require SL::DB::Vendor;
-
-    my $id = int($self->number_value);
-    return $id ? SL::DB::Vendor->new(id => $id)->load() : 0;
-  } elsif ( $type eq 'part' ) {
-    require SL::DB::Part;
-
-    my $id = int($self->number_value);
-    my $part = $id ? SL::DB::Part->new(id => $id)->load() : 0;
-    return $part ? $part->description : '';
+    return $::form->format_amount(\%::myconfig, $self->number_value, $cfg->processed_options->{PRECISION});
+  } elsif ( $type =~ m{^(?:customer|vendor|part)$}) {
+    my $class = "SL::DB::" . ucfirst($type);
+    eval "require $class";
+    my $object =  $class->_get_manager_class->find_by(id => int($self->number_value));
+    return $object ? $object->displayable_name : '';
   }
 
-  goto &text_value; # text, textfield, date and select
+  goto &text_value; # text, textfield and select
 }
 
 sub is_valid {