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

Timestamp:

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

Author:

nanardon

Message:

Use a generic filter to list objects

Location:

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts

Files:

• Web.pm (modified) (1 diff)
• Web/Controller/Ajax.pm (modified) (1 diff)
• Web/Controller/Aliases.pm (modified) (1 diff)
• Web/Controller/Users.pm (modified) (1 diff)
• Web/Model/AttrFilter.pm (modified) (2 diffs)
• Web/View/TTpart.pm (modified) (1 diff)

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

@@ -31 +31 @@
 
 __PACKAGE__->config(
+    objects => {
+        user => {
+            quick_search => [ qw(cn sn givenName) ],
+            list => [ qw(sn givenName mail) ],
+        },
+        group => {
+            quick_search => [ qw(cn description) ],
+            list => [ qw(description) ],
+        },
+        nethost => {
+            quick_search => [ qw(cn description ip cname otherName) ],
+            list => [ qw(description owner) ],
+        },
+        netzone => {
+            quick_search => [ qw(cn description ip) ],
+            list => [ qw(type description) ],
+        },
+        site => {
+            quick_search => [ qw(cn l) ],
+            list => [ qw(l) ],
+        },
+        aliases => {
+            quick_search => [ qw(name) ],
+            list => [ qw() ],
+        },
+
+    },
     'attrs' => {
         'physicalDeliveryOfficeName' => {

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Ajax.pm

@@ -180 +180 @@
 }
 
+sub list_objects : Local {
+    my ($self, $c, $otype) = @_;
+    $c->stash->{ofilter} = $c->model('AttrFilter', $otype);
+}
+
 sub end : Private {
     my ( $self, $c ) = @_;

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Aliases.pm

@@ -25 +25 @@
     my ( $self, $c ) = @_;
 
-    my $db = $c->model('Accounts')->db;
-    my @al = $c->req->param('al');
-    my @name = $c->req->param('name');
-    my @forward = $c->req->param('forward');
-    $c->stash->{page}{title} = "Gestion des alias";
-    foreach my $idx (0 .. scalar(@name) - 1) {
-
-        if ($c->req->param('del' . ($idx+1))) {
-            $db->delete_object('aliases', $al[$idx]);
-        } elsif ($al[$idx] ne $name[$idx]) {
-            # delete old, create new
-            $db->delete_c_object('aliases', $al[$idx]) if($al[$idx]);
-            $db->create_c_object('aliases', $name[$idx],
-                forward => [ split(/\s*,\s*/, $forward[$idx]) ],
-            );
-        } else {
-            my $obj = $db->get_object('aliases', $al[$idx]);
-            $obj->set_c_fields(
-                'forward' => [ split(/\s*,\s*/, $forward[$idx]) ],
-            );
-        }
-    }
-
-    $db->commit;
+    $c->stash->{ofilter} = $c->model('AttrFilter', 'aliases');
 }
 

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm

@@ -26 +26 @@
 
     $c->stash->{ofilter} = $c->model('AttrFilter', 'user');
-    my $start = $c->req->param('start');
-    $c->stash->{uparams} = { %{ $c->req->params || {} } };
-    my %initials;
-    my @userlist;
-    foreach (map { $_->id } @{ $c->stash->{objectslist} }) {
-        $initials{substr($_, 0, 1)} = 1;
-        if ($start) {
-            if (index($_, $start) == 0) {
-                push(@userlist, $_);
-            }
-        }
-    }
-    if (@{ $c->stash->{objectslist} } < 20) {
-        @userlist = map { $_->id } @{ $c->stash->{objectslist} };
-    } else {
-        $c->stash->{initials} = [ sort keys %initials ];
-    }
-    $c->stash->{page}{title} = 'Listes des utilisateurs (' . scalar(@{
-                $c->stash->{objectslist} }) . ')';
-    $c->stash->{userslist} = \@userlist;
 }
 

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}

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/View/TTpart.pm

@@ -10 +10 @@
     LATMOS::Accounts::Web->path_to( 'root', 'html' ),
     ],
+    PRE_PROCESS  => 'includes/defs.tt',
 );