ParseFilter: Bugfix bei short circuit bedingung

Test angepasst

diff --git a/SL/Controller/Helper/ParseFilter.pm b/SL/Controller/Helper/ParseFilter.pm
index 96d3b329603899d007b56a4e9f407d07158809d4..b7769bb8a86454032a271b6b820543249518f74c 100644 (file)
--- a/SL/Controller/Helper/ParseFilter.pm
+++ b/SL/Controller/Helper/ParseFilter.pm
@@ -39,8 +39,8 @@ sub parse_filter {
   _launder_keys($filter) unless $params{no_launder};
 
   return
   _launder_keys($filter) unless $params{no_launder};
 
   return

-    query => $query,
-    @$objects ? ( with_objects => [ uniq @$objects ]) : ();
+    ($query   && @$query   ? (query => $query) : ()),
+    ($objects && @$objects ? ( with_objects => [ uniq @$objects ]) : ());

 }
 
 sub _launder_keys {
 }
 
 sub _launder_keys {


@@ -61,7 +61,7 @@ sub _pre_parse {
   my ($filter, $with_objects, $prefix, %params) = @_;
 
   return () unless 'HASH'  eq ref $filter;
   my ($filter, $with_objects, $prefix, %params) = @_;
 
   return () unless 'HASH'  eq ref $filter;

-  $with_objects = [];
+  $with_objects ||= [];

 
   my @result;
 
 
   my @result;
 

diff --git a/t/controllers/helpers/parse_filter.t b/t/controllers/helpers/parse_filter.t
index 5a1ca07288e592d466f4d71a743d8fe888a013f9..03d5d1514cea3dc413217936553ddce3a18a1701 100644 (file)
--- a/t/controllers/helpers/parse_filter.t
+++ b/t/controllers/helpers/parse_filter.t
@@ -22,7 +22,6 @@ sub test ($$$) {
 }
 
 test { }, {
 }
 
 test { }, {

-  query => []

 }, 'minimal test';
 
 test {
 }, 'minimal test';
 
 test {


@@ -52,7 +51,7 @@ test {
   }
 }, {
   query => [ 'customer.chart.accno' => 'test' ],
   }
 }, {
   query => [ 'customer.chart.accno' => 'test' ],

-  with_objects => [ 'customer', 'chart' ],
+  with_objects => bag( 'customer', 'chart' ),

 }, 'nested joins';
 
 test {
 }, 'nested joins';
 
 test {


@@ -76,7 +75,7 @@ test {
 },
 {
   query => [ 'customer.chart.accno' => { like => '%1200' } ],
 },
 {
   query => [ 'customer.chart.accno' => { like => '%1200' } ],

-  with_objects => ['customer', 'chart' ],
+  with_objects => bag('customer', 'chart' ),

 }, 'all together';
 
 
 }, 'all together';
 
 


@@ -94,10 +93,7 @@ test {
                'invoice.customer.name'  => 'test',
                'customer.name'          => 'test',
              }} ],
                'invoice.customer.name'  => 'test',
                'customer.name'          => 'test',
              }} ],

-  'with_objects' => [
-                      'invoice',
-                      'customer'
-                    ]
+  'with_objects' => bag( 'invoice', 'customer' )

 }, 'object in more than one relationship';
 
 test {
 }, 'object in more than one relationship';
 
 test {