Partpicker: Benutzerdefinierte Variablen mitschicken

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index e64a774a76f0fb9c56a69f903e0fef13223a7e64..d5a7f2a5f139464f4aaffedaf19e147d7f6b2e76 100644 (file)
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -52,6 +52,7 @@ sub action_ajax_autocomplete {
      description => $_->description,
      type        => $_->type,
      unit        => $_->unit,
      description => $_->description,
      type        => $_->type,
      unit        => $_->unit,

+     cvars       => { map { ($_->config->name => { value => $_->value_as_text, is_valid => $_->is_valid }) } @{ $_->cvars_by_config } },

     }
   } @{ $self->parts }; # neato: if exact match triggers we don't even need the init_parts
 
     }
   } @{ $self->parts }; # neato: if exact match triggers we don't even need the init_parts
 

diff --git a/SL/DB/CustomVariable.pm b/SL/DB/CustomVariable.pm
index 3f894cd012ed3b9275249b8dffb3aed6d7dcc597..d9b154c09b10e59fc854819e8f29d541e37296e4 100644 (file)
--- a/SL/DB/CustomVariable.pm
+++ b/SL/DB/CustomVariable.pm
@@ -118,7 +118,7 @@ sub is_valid {
   require SL::DB::CustomVariableValidity;
 
   my $query = [config_id => $self->config_id, trans_id => $self->trans_id];
   require SL::DB::CustomVariableValidity;
 
   my $query = [config_id => $self->config_id, trans_id => $self->trans_id];

-  return SL::DB::Manager::CustomVariableValidity->get_all_count(query => $query) == 0;
+  return (SL::DB::Manager::CustomVariableValidity->get_all_count(query => $query) == 0) ? 1 : 0;

 }
 
 1;
 }
 
 1;