PartPicker get_models

diff --git a/SL/Controller/Part.pm b/SL/Controller/Part.pm
index 38b3b55027507ea7795f2b70a011960b86ee08a2..97c0159cc77ac2f0ff2d2b24f2aa2f27d79d1ea2 100644 (file)
--- 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 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 (
 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') });
 
 );
 
 # 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) = @_;
 
 sub action_ajax_autocomplete {
   my ($self, %params) = @_;
 


@@ -92,7 +71,23 @@ sub action_part_picker_result {
 }
 
 sub init_parts {
 }
 
 sub init_parts {

-  $_[0]->get_models(with_objects => [ qw(unit_obj) ]);
+  $_[0]->models->get (with_objects => [ qw(unit_obj) ]);
+}
+
+sub init_models {
+  my ($self) = @_;
+
+  SL::Controller::Helper::GetModels->new(
+    controller => $self,
+    model  => 'Part',
+    sorted => {
+      _default  => {
+        by => 'partnumber',
+        dir  => 1,
+      },
+      partnumber  => t8('Partnumber'),
+    }
+  );

 }
 
 1;
 }
 
 1;

diff --git a/templates/webpages/part/_part_picker_result.html b/templates/webpages/part/_part_picker_result.html
index 6b848f3b49a379fed9aee64990bb02a3e14e2b0e..eba16dcd8ffc4e98af7dcfede1979e8e5f177c45 100644 (file)
--- a/templates/webpages/part/_part_picker_result.html
+++ b/templates/webpages/part/_part_picker_result.html
@@ -23,7 +23,7 @@
 
 <div style='clear:both'></div>
 
 
 <div style='clear:both'></div>
 

-[% L.paginate_controls(target='#part_picker_result', selector='#part_picker_result') %]
+[% L.paginate_controls(target='#part_picker_result', selector='#part_picker_result', models=SELF.models) %]

 
 <script type='text/javascript'>
   kivi.PartPicker($('#'+$('#part_picker_real_id').val())).init_results()
 
 <script type='text/javascript'>
   kivi.PartPicker($('#'+$('#part_picker_real_id').val())).init_results()