Changeset 1809

Timestamp:

06/30/16 04:41:51 (8 years ago)

Author:

nanardon

Message:

Fix search with not empty filter array but null string

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm

@@ -35 +35 @@
 
     my $key = $c->req->param('key') || 'department';
-    my @filter = $c->req->param('filter');
+    my @filter = $c->req->param('filter') || '';
 
     my $keyobj = $key =~ m/^(company|department|contratType|manager)$/
@@ -45 +45 @@
         : 'user';
 
+    @filter = grep { $_ } @filter;
     my %end = $base->attributes_summary_by_object('employment', 'lastday');
     my %start = $base->attributes_summary_by_object('employment', 'firstday');

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -774 +774 @@
     my $results = {};
 
+    @filter = grep { defined($_) && $_ ne '' } @filter;
     if (!@filter) {
         my ($package, $filename, $line) = caller;