Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[kivitendo-erp.git] / SL / Controller / Part.pm

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 60bebd4..d5a7f2a 100644 (file)
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -10,11 +10,12 @@ 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) = @_;
@@ -32,8 +33,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,
@@ -50,6 +51,8 @@ sub action_ajax_autocomplete {
      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
 
@@ -70,10 +73,35 @@ 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 {
+      require Rose::DB::Object::Helpers;
+        $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) = @_;
 
@@ -81,10 +109,11 @@ sub init_models {
     controller => $self,
     sorted => {
       _default  => {
-        by => 'partnumber',
+        by => 'description',
         dir  => 1,
       },
       partnumber  => t8('Partnumber'),
+      description  => t8('Description'),
     },
     with_objects => [ qw(unit_obj) ],
   );