Pflichtenhefte: falsche Klammerung

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

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 904e6c5..4349b1f 100644 (file)
--- a/SL/Controller/Part.pm
+++ b/SL/Controller/Part.pm
@@ -6,36 +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'),
-);
+__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) = @_;
@@ -71,6 +51,7 @@ sub action_ajax_autocomplete {
      partnumber  => $_->partnumber,
      description => $_->description,
      type        => $_->type,
+     unit        => $_->unit,
     }
   } @{ $self->parts }; # neato: if exact match triggers we don't even need the init_parts
 
@@ -92,7 +73,23 @@ sub action_part_picker_result {
 }
 
 sub init_parts {
-  $_[0]->get_models(with_objects => [ qw(unit_obj) ]);
+  $_[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;