X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FPart.pm;h=bd5fe6a301529053a06d965ea3f4ba0789f9de52;hb=bdc944eae9567aa4bd256b56b89f6004890fc585;hp=60bebd4c13d4026ffbbda7bf04d81022a40914ed;hpb=2f374c963333aa8ee6ebbab7942b57386585c58b;p=kivitendo-erp.git

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 60bebd4c1..bd5fe6a30 100644
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -10,17 +10,16 @@ use SL::Locale::String qw(t8);
 use SL::JSON;
 
 use Rose::Object::MakeMethods::Generic (
-  'scalar --get_set_init' => [ qw(parts models) ],
+  'scalar --get_set_init' => [ qw(parts models part) ],
 );
 
 # safety
-__PACKAGE__->run_before(sub { $::auth->assert('part_service_assembly_edit') });
+__PACKAGE__->run_before(sub { $::auth->assert('part_service_assembly_edit') },
+                        except => [ qw(ajax_autocomplete part_picker_search part_picker_result) ]);
 
 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
@@ -32,8 +31,8 @@ sub action_ajax_autocomplete {
         obsolete => 0,
         SL::DB::Manager::Part->type_filter($::form->{filter}{type}),
         or => [
-          description => { ilike => $::form->{filter}{'all:substr::ilike'} },
-          partnumber  => { ilike => $::form->{filter}{'all:substr::ilike'} },
+          description => { ilike => $::form->{filter}{'all:substr:multi::ilike'} },
+          partnumber  => { ilike => $::form->{filter}{'all:substr:multi::ilike'} },
         ]
       ],
       limit => 2,
@@ -44,12 +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
 
@@ -57,8 +58,6 @@ sub action_ajax_autocomplete {
 }
 
 sub action_test_page {
-  $::request->{layout}->add_javascripts('autocomplete_part.js');
-
   $_[0]->render('part/test_page');
 }
 
@@ -70,10 +69,34 @@ sub action_part_picker_result {
   $_[0]->render('part/_part_picker_result', { layout => 0 });
 }
 
+sub action_show {
+  my ($self) = @_;
+
+  if ($::request->type eq 'json') {
+    my $part_hash;
+    if (!$self->part) {
+      # TODO error
+    } else {
+      $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 });
+  }
+}
+
 sub init_parts {
+  if ($::form->{no_paginate}) {
+    $_[0]->models->disable_plugin('paginated');
+  }
+
   $_[0]->models->get;
 }
 
+sub init_part {
+  SL::DB::Part->new(id => $::form->{id} || $::form->{part}{id})->load;
+}
+
 sub init_models {
   my ($self) = @_;
 
@@ -85,6 +108,7 @@ sub init_models {
         dir  => 1,
       },
       partnumber  => t8('Partnumber'),
+      description  => t8('Description'),
     },
     with_objects => [ qw(unit_obj) ],
   );