Changeset 240 for LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller

Timestamp:

06/07/09 13:58:17 (15 years ago)

Author:

nanardon

Message:

• cleanup filter code

Location:

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller

Files:

• Groups.pm (modified) (1 diff)
• MassEdit.pm (modified) (3 diffs)
• Sites.pm (modified) (1 diff)
• Users.pm (modified) (1 diff)

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Groups.pm

@@ -24 +24 @@
 sub index : Private {
     my ( $self, $c ) = @_;
-    my $base = $c->model('Accounts')->db;
-    $c->stash->{filter}->{otype} = 'group';
-    $c->forward('filter');
+
+    $c->stash->{ofilter} = $c->model('AttrFilter', 'site');
     $c->stash->{groupslist} = [  map { $_->id } @{ $c->stash->{objectslist} } ];
 

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/MassEdit.pm

@@ -29 +29 @@
     if ($c->req->param('otype') && $c->req->param('otype') ne $c->session->{filter}{otype}) {
         $c->session->{filter} = undef;
-        $c->stash->{filter}->{otype} = $c->req->param('otype');
+        $c->stash->{filter}{otype} = $c->req->param('otype');
         $c->session->{massedit}{attrcol} = undef;
     } else {
@@ -39 +39 @@
         }
     }
+    $c->stash->{ofilter} = $c->model('AttrFilter', 'site');
 
     if (($c->req->param('_change') || '') eq 'all') {
@@ -63 +64 @@
         $base->commit;
     }
-    $c->forward('filter');
     $c->session->{filter} = $c->stash->{filter};
 }

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Sites.pm

@@ -25 +25 @@
     my ( $self, $c ) = @_;
 
-    my $base = $c->model('Accounts')->db;
-    $c->stash->{filter}->{otype} = 'site';
-    $c->forward('filter');
+    $c->stash->{ofilter} = $c->model('AttrFilter', 'site');
     $c->stash->{siteslist} = [  map { $_->id } @{ $c->stash->{objectslist} } ];
 }

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

@@ -25 +25 @@
     my ( $self, $c ) = @_;
 
-    my $base = $c->model('Accounts')->db;
-    $c->stash->{filter}->{otype} = 'user';
-    $c->forward('filter');
+    $c->stash->{ofilter} = $c->model('AttrFilter', 'user');
     $c->stash->{userslist} = [  map { $_->id } @{ $c->stash->{objectslist} } ];
 }