X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FPart.pm;h=bd5fe6a301529053a06d965ea3f4ba0789f9de52;hb=ae0934652e56d9e6aed79abcc1c686d0580e3bee;hp=e64a774a76f0fb9c56a69f903e0fef13223a7e64;hpb=766f5705ecb9cd56adfbffd94c871959bb64c6fd;p=kivitendo-erp.git

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index e64a774a7..bd5fe6a30 100644
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -20,8 +20,6 @@ __PACKAGE__->run_before(sub { $::auth->assert('part_service_assembly_edit') },
 sub action_ajax_autocomplete {
   my ($self, %params) = @_;
 
-  my $value = $::form->{column} || 'description';
-
   # if someone types something, and hits enter, assume he entered the full name.
   # if something matches, treat that as sole match
   # unfortunately get_models can't do more than one per package atm, so we d it
@@ -45,13 +43,14 @@ sub action_ajax_autocomplete {
 
   my @hashes = map {
    +{
-     value       => $_->$value,
-     label       => $_->long_description,
+     value       => $_->displayable_name,
+     label       => $_->displayable_name,
      id          => $_->id,
      partnumber  => $_->partnumber,
      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
 
@@ -59,8 +58,6 @@ sub action_ajax_autocomplete {
 }
 
 sub action_test_page {
-  $::request->{layout}->add_javascripts('autocomplete_part.js');
-
   $_[0]->render('part/test_page');
 }
 
@@ -80,9 +77,8 @@ sub action_show {
     if (!$self->part) {
       # TODO error
     } else {
-      require Rose::DB::Object::Helpers;
-        $part_hash          = $self->part->as_tree;
-        $part_hash->{cvars} = $self->part->cvar_as_hashref;
+      $part_hash          = $self->part->as_tree;
+      $part_hash->{cvars} = $self->part->cvar_as_hashref;
     }
 
     $self->render(\ SL::JSON::to_json($part_hash), { layout => 0, type => 'json', process => 0 });
@@ -108,7 +104,7 @@ sub init_models {
     controller => $self,
     sorted => {
       _default  => {
-        by => 'description',
+        by => 'partnumber',
         dir  => 1,
       },
       partnumber  => t8('Partnumber'),