Changeset 1135 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFilter.pm

Timestamp:

09/15/12 08:52:16 (12 years ago)

Author:

nanardon

Message:

Merge branch 'dyngroup'

File:

• trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFilter.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFilter.pm

@@ -41 +41 @@
 
     my @objlist = ();
-    if ($c->req->params->{'q'}) {
-        my %objs;
-        foreach my $attr (@{ $c->config->{objects}{$otype}{quick_search} || [ 'cn' ]}) {
-            foreach ($base->search_objects(
-                    $otype, "$attr~" . $c->req->params->{'q'})) {
-                $objs{$_} = 1;
+    if ($c->req->params->{'q'} || exists($c->req->params->{'attr'}) ) {
+        my %objs = ();
+        if ($c->req->params->{'q'}) {
+            foreach my $attr (@{ $c->config->{objects}{$otype}{quick_search} || [ 'cn' ]}) {
+                foreach ($base->search_objects(
+                        $otype, "$attr~" . $c->req->params->{'q'})) {
+                    $objs{$_} = 1;
+                }
+                @objlist = sort keys %objs;
             }
-            @objlist = sort keys %objs;
         }
-    } elsif (exists($c->req->params->{'attr'})) {
-        $self->{filter}{'attr'} = [ $c->req->param('attr') ];
-        $self->{filter}{'attrval'} = [ $c->req->param('attrval') ];
-        my @filter = $self->filter;
-        @objlist = $base->search_objects($otype, @filter);
+
+        if (exists($c->req->params->{'attr'})) {
+            $self->{filter}{'attr'} = [ $c->req->param('attr') ];
+            $self->{filter}{'attrval'} = [ $c->req->param('attrval') ];
+            my @filter = $self->filter;
+            @objlist = $base->search_objects($otype, @filter);
+            if ($c->req->params->{'q'}) {
+                @objlist = grep { $objs{$_} } @objlist;
+            }
+        }
     } else {
         @objlist = $base->list_objects($otype);