Part api Funktion um eine Ware als json abzufragen

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 4349b1fdac87fe2e001cb87756751e12fa852634..e64a774a76f0fb9c56a69f903e0fef13223a7e64 100644 (file)
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -10,7 +10,7 @@ use SL::Locale::String qw(t8);
 use SL::JSON;
 
 use Rose::Object::MakeMethods::Generic (
 use SL::JSON;
 
 use Rose::Object::MakeMethods::Generic (

-  'scalar --get_set_init' => [ qw(parts models) ],
+  'scalar --get_set_init' => [ qw(parts models part) ],

 );
 
 # safety
 );
 
 # safety


@@ -33,8 +33,8 @@ sub action_ajax_autocomplete {
         obsolete => 0,
         SL::DB::Manager::Part->type_filter($::form->{filter}{type}),
         or => [
         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,
         ]
       ],
       limit => 2,


@@ -72,10 +72,35 @@ sub action_part_picker_result {
   $_[0]->render('part/_part_picker_result', { layout => 0 });
 }
 
   $_[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 {
 sub init_parts {

+  if ($::form->{no_paginate}) {
+    $_[0]->models->disable_plugin('paginated');
+  }
+

   $_[0]->models->get;
 }
 
   $_[0]->models->get;
 }
 

+sub init_part {
+  SL::DB::Part->new(id => $::form->{id} || $::form->{part}{id})->load;
+}
+

 sub init_models {
   my ($self) = @_;
 
 sub init_models {
   my ($self) = @_;
 


@@ -83,10 +108,11 @@ sub init_models {
     controller => $self,
     sorted => {
       _default  => {
     controller => $self,
     sorted => {
       _default  => {

-        by => 'partnumber',
+        by => 'description',

         dir  => 1,
       },
       partnumber  => t8('Partnumber'),
         dir  => 1,
       },
       partnumber  => t8('Partnumber'),

+      description  => t8('Description'),

     },
     with_objects => [ qw(unit_obj) ],
   );
     },
     with_objects => [ qw(unit_obj) ],
   );

diff --git a/SL/DB/Part.pm b/SL/DB/Part.pm
index ecdaeaabe4f24139766c2e77f030ea634fff216a..9f2c4bd5210e657806a358243b9e0ec212dc1902 100644 (file)
--- a/SL/DB/Part.pm
+++ b/SL/DB/Part.pm
@@ -4,6 +4,7 @@ use strict;
 
 use Carp;
 use List::MoreUtils qw(any);
 
 use Carp;
 use List::MoreUtils qw(any);

+use Rose::DB::Object::Helpers qw(as_tree);

 
 use SL::DBUtils;
 use SL::DB::MetaSetup::Part;
 
 use SL::DBUtils;
 use SL::DB::MetaSetup::Part;

diff --git a/js/autocomplete_part.js b/js/autocomplete_part.js
index 62c1bf4bfd726a52f0258a54f21a7514fce03501..a08130b63103f31c8925cca6101eae623dca7d2f 100644 (file)
--- a/js/autocomplete_part.js
+++ b/js/autocomplete_part.js
@@ -53,7 +53,7 @@ namespace('kivi', function(k){
 
     function ajax_data(term) {
       var data = {
 
     function ajax_data(term) {
       var data = {

-        'filter.all:substr::ilike': term,
+        'filter.all:substr:multi::ilike': term,

         'filter.obsolete': 0,
         'filter.unit_obj.convertible_to': $convertible_unit && $convertible_unit.val() ? $convertible_unit.val() : '',
         no_paginate:  $('#no_paginate').prop('checked') ? 1 : 0,
         'filter.obsolete': 0,
         'filter.unit_obj.convertible_to': $convertible_unit && $convertible_unit.val() ? $convertible_unit.val() : '',
         no_paginate:  $('#no_paginate').prop('checked') ? 1 : 0,