Changeset 1081 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model

Timestamp:

07/28/12 09:20:21 (12 years ago)

Author:

nanardon

Message:

Use a generic filter to list objects

File:

• trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFilter.pm (modified) (2 diffs)

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

@@ -21 +21 @@
     nethost => [ qw(name cname otherName ip macaddr owner serialNumber) ],
     netzone => [ qw(net group type site) ],
+    aliases => [ qw(as) ],
 };
 
@@ -37 +38 @@
         otype => $otype,
     } unless($c->stash->{filter});
-    if (exists($c->req->params->{'attr'})) {
+    $c->stash->{ofilter} = bless($new, __PACKAGE__);
+
+    $c->stash->{db} ||= $c->model('Accounts')->db; # need in stash ?
+    my $base = $c->stash->{db};
+
+    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;
+            }
+            @objlist = sort keys %objs;
+        }
+    } elsif (exists($c->req->params->{'attr'})) {
         $c->stash->{filter}{'attr'} = [ $c->req->param('attr') ];
         $c->stash->{filter}{'attrval'} = [ $c->req->param('attrval') ];
+        my @filter = $c->stash->{ofilter}->filter;
+        @objlist = $base->search_objects($otype, @filter);
+    } else {
+        @objlist = $base->list_objects($otype);
     }
-    
-    $c->stash->{ofilter} = bless($new, __PACKAGE__);
-    $c->stash->{db} ||= $c->model('Accounts')->db;
-    my $base = $c->stash->{db};
 
-    my @filter = $c->stash->{ofilter}->filter;
     $c->stash->{objectslist} = [
         map { $base->get_object($otype, $_) }
-        (@filter
-            ? ($base->search_objects($otype, @filter) )
-            : ($base->list_objects($otype) ))
+         @objlist
     ];
+
+    my $start = $c->req->param('start');
+    $c->stash->{uparams} = { %{ $c->req->params || {} } };
+    my %initials;
+    my @sublist;
+    foreach (@{ $c->stash->{objectslist} }) {
+        $initials{substr($_->id, 0, 1)} = 1;
+        if ($start) {
+            if (index($_->id, $start) == 0) {
+                push(@sublist, $_);
+            }
+        }
+    }
+    $c->stash->{sublist} = [ @sublist ];
+    $c->stash->{initials} = [ sort keys %initials ];
 
     $c->stash->{ofilter}