GetModels Filtered: gelaunderten Filter nicht mehr in Controller schreiben

Statt dessen kann der gelaunderte Filter über das Filtered-Plugin
abgefragt werden, z.B. im Controller:

$self->models->filtered->laundered

oder im Template:

SELF.models.filtered.laundered

diff --git a/SL/Controller/Chart.pm b/SL/Controller/Chart.pm
index 274f2ea5671516c62e6b567fb7d528bd8a0824ec..624a65b1da52324e90bbbf890aa5ff822752d2fa 100644 (file)
--- a/SL/Controller/Chart.pm
+++ b/SL/Controller/Chart.pm
@@ -10,7 +10,7 @@ use SL::Locale::String qw(t8);
 use SL::JSON;
 
 use Rose::Object::MakeMethods::Generic (
-  'scalar --get_set_init' => [ qw(charts models chart) ],
+  'scalar --get_set_init' => [ qw(charts models chart filter) ],
 );
 
 sub action_ajax_autocomplete {
@@ -111,4 +111,6 @@ sub init_models {
   );
 }
 
+sub init_filter { $_[0]->models->filtered->laundered }
+
 1;

diff --git a/SL/Controller/Helper/GetModels/Filtered.pm b/SL/Controller/Helper/GetModels/Filtered.pm
index 849c0e065ac85311559c7943ee141156cde31f34..63258154b370417b453a3a168a3292ee3fdf65a5 100644 (file)
--- a/SL/Controller/Helper/GetModels/Filtered.pm
+++ b/SL/Controller/Helper/GetModels/Filtered.pm
@@ -53,14 +53,6 @@ sub read_params {
   my %calculated_params = SL::Controller::Helper::ParseFilter::parse_filter($filter, %parse_filter_args);
   %calculated_params = $self->merge_args(\%calculated_params, \%filter_args, \%params);
 
-  if ($self->laundered) {
-    if ($self->get_models->controller->can('filter')) {
-      $self->get_models->controller->filter($self->laundered);
-    } else {
-      $self->get_models->controller->{filter} = $self->laundered;
-    }
-  }
-
   # $::lxdebug->dump(0, "get_current_filter_params: ", \%calculated_params);
 
   $self->filter_params(\%calculated_params);

diff --git a/templates/webpages/background_job_history/list.html b/templates/webpages/background_job_history/list.html
index 1a2b94887fed666f69155e637b8703f6825d8e6c..2f251e275ef01bfff88761f433163a32c35f572f 100644 (file)
--- a/templates/webpages/background_job_history/list.html
+++ b/templates/webpages/background_job_history/list.html
@@ -4,7 +4,7 @@
 
 [%- INCLUDE 'common/flash.html' %]
 
-[%- PROCESS 'background_job_history/_filter.html' filter=SELF.filter %]
+[%- PROCESS 'background_job_history/_filter.html' filter=SELF.models.filtered.laundered %]
 
 [% IF !ENTRIES.size %]
  <p>

diff --git a/templates/webpages/bank_transactions/report_top.html b/templates/webpages/bank_transactions/report_top.html
index f6fbce1d6ed8843c16aa13c5dee345289b88d404..8b98dcbb0f72163bf3ffedbc053e31f0e954c451 100644 (file)
--- a/templates/webpages/bank_transactions/report_top.html
+++ b/templates/webpages/bank_transactions/report_top.html
@@ -1,3 +1,3 @@
 [%- USE L %]
-[%- PROCESS 'bank_transactions/_filter.html' filter=SELF.filter %]
+[%- PROCESS 'bank_transactions/_filter.html' filter=SELF.models.filtered.laundered %]
  <hr>

diff --git a/templates/webpages/delivery_plan/report_top.html b/templates/webpages/delivery_plan/report_top.html
index cc35146be15600cabbda26658169ca70797cd4d1..01d0ff9af7b3cea9e009cac279c964d0406baedf 100644 (file)
--- a/templates/webpages/delivery_plan/report_top.html
+++ b/templates/webpages/delivery_plan/report_top.html
@@ -1,3 +1,3 @@
 [%- USE L %]
-[%- PROCESS 'delivery_plan/_filter.html' filter=SELF.filter %]
+[%- PROCESS 'delivery_plan/_filter.html' filter=SELF.models.filtered.laundered %]
  <hr>

diff --git a/templates/webpages/financial_controlling_report/report_top.html b/templates/webpages/financial_controlling_report/report_top.html
index 5fb399cf99dbd5dd54ef62ab01c97f7b5d364a0f..1312d75a35a9572c83a38ac5ea4fabb9ff242e70 100644 (file)
--- a/templates/webpages/financial_controlling_report/report_top.html
+++ b/templates/webpages/financial_controlling_report/report_top.html
@@ -1,3 +1,3 @@
 [%- USE L %]
-[%- PROCESS 'financial_controlling_report/_filter.html' filter=SELF.filter %]
+[%- PROCESS 'financial_controlling_report/_filter.html' filter=SELF.models.filtered.laundered %]
  <hr>

diff --git a/templates/webpages/part/part_picker_search.html b/templates/webpages/part/part_picker_search.html
index 4d625c7aebfdbb83a93cd49830d60ed12ec84a02..5669d8eeface4b265c3851659a4324d20b8299bc 100644 (file)
--- a/templates/webpages/part/part_picker_search.html
+++ b/templates/webpages/part/part_picker_search.html
@@ -5,7 +5,7 @@
 
 <div style='overflow:hidden'>
 
-[% LxERP.t8("Filter") %]: [% L.input_tag('part_picker_filter', SELF.filter.all_substr_multi__ilike, class='part_picker_filter') %]
+[% LxERP.t8("Filter") %]: [% L.input_tag('part_picker_filter', SELF.models.filtered.laundered.all_substr_multi__ilike, class='part_picker_filter') %]
 [% L.hidden_tag('part_picker_real_id', FORM.real_id) %]
 
 <div class='float-right'>

diff --git a/templates/webpages/price_rule/report_top.html b/templates/webpages/price_rule/report_top.html
index 0af23b4d59a095dcffa2e183b8f25df30de55778..a534a87331aa58d420ab61527b6d4cff5f3f431c 100644 (file)
--- a/templates/webpages/price_rule/report_top.html
+++ b/templates/webpages/price_rule/report_top.html
@@ -1,4 +1,4 @@
 [%- USE L %]
 [%- PROCESS 'common/flash.html' %]
-[%- PROCESS 'price_rule/_filter.html' filter=SELF.filter UNLESS FORM.inline %]
+[%- PROCESS 'price_rule/_filter.html' filter=SELF.models.filtered.laundered UNLESS FORM.inline %]
  <hr>

diff --git a/templates/webpages/project/report_top.html b/templates/webpages/project/report_top.html
index df03f9ebe11a129b7a0bb1eab256109553b912fd..87c7efee551e489c136e1bef627b5e31bb2a20be 100644 (file)
--- a/templates/webpages/project/report_top.html
+++ b/templates/webpages/project/report_top.html
@@ -9,7 +9,7 @@
 </div>
 <div class='filter_toggle' style='display:none'>
 <a href='#' onClick='javascript:$(".filter_toggle").toggle()'>[% 'Hide Filter' | $T8 %]</a>
-[%- PROCESS 'project/_filter.html' filter=SELF.filter %]
+[%- PROCESS 'project/_filter.html' filter=SELF.models.filtered.laundered %]
 
 [% L.hidden_tag('action', 'Project/dispatch') %]
 [% L.hidden_tag('sort_by', FORM.sort_by) %]

diff --git a/templates/webpages/requirement_spec/report_top.html b/templates/webpages/requirement_spec/report_top.html
index 507bfaed649f44995af3fe10c764f65667eb7d61..457e05e14f0dcec775177746988bea7775a2580b 100644 (file)
--- a/templates/webpages/requirement_spec/report_top.html
+++ b/templates/webpages/requirement_spec/report_top.html
@@ -1,3 +1,3 @@
 [%- USE L %]
-[%- PROCESS "requirement_spec/_filter.html" filter=SELF.filter %]
+[%- PROCESS "requirement_spec/_filter.html" filter=SELF.models.filtered.laundered %]
  <hr>