X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FPart.pm;h=4349b1fdac87fe2e001cb87756751e12fa852634;hb=76105d1596c47e6883d527d21de683baa65c9c90;hp=346a5446d214dd1fcaa1b6a853fe481df8010262;hpb=2504ebe1552b488aa48999535963cc0e6bc3d4ae;p=kivitendo-erp.git

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 346a5446d..4349b1fda 100644
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -6,52 +6,56 @@ 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) ],
-  LAUNDER_TO    => 'filter',
-);
-__PACKAGE__->make_paginated(
-  ONLY          => [ qw(part_picker_search part_picker_result) ],
-);
-
-__PACKAGE__->make_sorted(
-  ONLY              => [ qw(part_picker_search part_picker_result) ],
-
-  DEFAULT_BY        => 'partnumber',
-  DEFAULT_DIR       => 1,
-
-  partnumber        => t8('Partnumber'),
-);
+__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 $limit  = $::form->{limit}  || 20;
-  my $type   = $::form->{type} || {};
-  my $query  = { ilike => "%$::form->{term}%" };
-  my @filter;
-  push @filter, SL::DB::Manager::Part->type_filter($type);
-  push @filter, ($::form->{column})
-    ? ($::form->{column} => $query)
-    : (or => [ partnumber => $query, description => $query ]);
-
-  $self->{parts} = SL::DB::Manager::Part->get_all(query => [ @filter ], limit => $limit);
-  $self->{value} = $::form->{column} || 'description';
-
-  $self->render('part/ajax_autocomplete', { layout => 0, type => 'json' });
+  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
+  # the oldfashioned way.
+  if ($::form->{prefer_exact}) {
+    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 {
+   +{
+     value       => $_->$value,
+     label       => $_->long_description,
+     id          => $_->id,
+     partnumber  => $_->partnumber,
+     description => $_->description,
+     type        => $_->type,
+     unit        => $_->unit,
+    }
+  } @{ $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 });
 }
 
 sub action_test_page {
@@ -69,7 +73,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;