X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FPart.pm;h=60bebd4c13d4026ffbbda7bf04d81022a40914ed;hb=a581d5bd98f0651b7955adccda1ef73c9e39708d;hp=4d8da25f854a57e0b2e675f622d24497d20e3bd2;hpb=7a6466811399cba50ab3a55f18665b5663f6d3a5;p=kivitendo-erp.git

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 4d8da25f8..60bebd4c1 100644
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -6,37 +6,16 @@ use parent qw(SL::Controller::Base);
 use Clone qw(clone);
 use SL::DB::Part;
 use SL::Controller::Helper::GetModels;
-use SL::Controller::Helper::Filtered;
-use SL::Controller::Helper::Sorted;
-use SL::Controller::Helper::Paginated;
-use SL::Controller::Helper::Filtered;
 use SL::Locale::String qw(t8);
 use SL::JSON;
 
 use Rose::Object::MakeMethods::Generic (
-  'scalar --get_set_init' => [ qw(parts) ],
+  'scalar --get_set_init' => [ qw(parts models) ],
 );
 
 # safety
 __PACKAGE__->run_before(sub { $::auth->assert('part_service_assembly_edit') });
 
-__PACKAGE__->make_filtered(
-  ONLY          => [ qw(part_picker_search part_picker_result ajax_autocomplete) ],
-  LAUNDER_TO    => 'filter',
-);
-__PACKAGE__->make_paginated(
-  ONLY          => [ qw(part_picker_search part_picker_result ajax_autocomplete) ],
-);
-
-__PACKAGE__->make_sorted(
-  ONLY              => [ qw(part_picker_search part_picker_result ajax_autocomplete) ],
-
-  DEFAULT_BY        => 'partnumber',
-  DEFAULT_DIR       => 1,
-
-  partnumber        => t8('Partnumber'),
-);
-
 sub action_ajax_autocomplete {
   my ($self, %params) = @_;
 
@@ -44,8 +23,23 @@ sub action_ajax_autocomplete {
 
   # 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
+  # the oldfashioned way.
   if ($::form->{prefer_exact}) {
-    # TODO!
+    my $exact_matches;
+    if (1 == scalar @{ $exact_matches = SL::DB::Manager::Part->get_all(
+      query => [
+        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'} },
+        ]
+      ],
+      limit => 2,
+    ) }) {
+      $self->parts($exact_matches);
+    }
   }
 
   my @hashes = map {
@@ -57,7 +51,7 @@ sub action_ajax_autocomplete {
      description => $_->description,
      type        => $_->type,
     }
-  } @{ $self->parts };
+  } @{ $self->parts }; # neato: if exact match triggers we don't even need the init_parts
 
   $self->render(\ SL::JSON::to_json(\@hashes), { layout => 0, type => 'json', process => 0 });
 }
@@ -77,7 +71,23 @@ sub action_part_picker_result {
 }
 
 sub init_parts {
-  $_[0]->get_models;
+  $_[0]->models->get;
+}
+
+sub init_models {
+  my ($self) = @_;
+
+  SL::Controller::Helper::GetModels->new(
+    controller => $self,
+    sorted => {
+      _default  => {
+        by => 'partnumber',
+        dir  => 1,
+      },
+      partnumber  => t8('Partnumber'),
+    },
+    with_objects => [ qw(unit_obj) ],
+  );
 }
 
 1;