Merge branch 'master' of github.com:kivitendo/kivitendo-erp

diff --git a/SL/Controller/Helper/ParseFilter.pm b/SL/Controller/Helper/ParseFilter.pm
index 38be03e89214bef22357ed070f5ce0392086be37..cdd3eb7a75db7b7af7d080dbd03f8e487ee67622 100644 (file)
--- a/SL/Controller/Helper/ParseFilter.pm
+++ b/SL/Controller/Helper/ParseFilter.pm
@@ -151,7 +151,18 @@ sub _dispatch_custom_filters {
   my @tokens     = split /\./, $key;
   my $curr_class = $class->object_class;
 
-  # find first token which is not a relationship
+  # our key will consist of dot-delimited tokens
+  # like this: order.part.unit.name
+  # each of these tokens except the last one is one of:
+  #  - a relationship in the parent object
+  #  - a custom filter
+  #
+  # the last token must be
+  #  - a custom filter
+  #  - a column in the parent object
+  #
+  # find first token which is not a relationship,
+  # so we can pass the rest on
   my $i = 0;
    while ($i < $#tokens) {
     eval {

diff --git a/t/controllers/helpers/parse_filter.t b/t/controllers/helpers/parse_filter.t
index a53c8c46929f4cebbc9e83de493b4b759ac37d04..aa8856ab42d83af5372e45855ef3a7daea4cabc1 100644 (file)
--- a/t/controllers/helpers/parse_filter.t
+++ b/t/controllers/helpers/parse_filter.t
@@ -1,6 +1,6 @@
 use lib 't';
 
-use Test::More tests => 36;
+use Test::More tests => 37;
 use Test::Deep;
 use Data::Dumper;
 
@@ -397,3 +397,11 @@ test {
     'part.test' => { 'what', { ilike => '%2%' } },
   ]
 }, 'additional tokens + filters + methods', class => 'SL::DB::Manager::OrderItem';
+
+test {
+  'orderitems.part.test.what:substr::ilike' => 2,
+}, {
+  query => [
+    'orderitems.part.test' => { 'what', { ilike => '%2%' } },
+  ]
+}, 'relationship + additional tokens + filters + methods', class => 'SL::DB::Manager::Order';