Changeset 1131 for trunk/LATMOS-Accounts-Web

Timestamp:

09/05/12 06:35:14 (12 years ago)

Author:

nanardon

Message:

AttrFilter? don't automatically fill stash anymore

Location:

trunk/LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Model/AttrFilter.pm (modified) (6 diffs)
• root/html/includes/list_objects.tt (modified) (2 diffs)
• root/html/includes/select_objects_list.tt (modified) (2 diffs)

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

@@ -35 +35 @@
     $new->{c} = $c;
     $new->{otype} = $otype;
-    $c->stash->{filter} = {
-        otype => $otype,
-    } unless($c->stash->{filter});
-    $c->stash->{ofilter} = bless($new, __PACKAGE__);
+    $new->{base} = $c->model('Accounts')->db;
+    $self = bless($new, __PACKAGE__);
 
-    $c->stash->{db} ||= $c->model('Accounts')->db; # need in stash ?
-    my $base = $c->stash->{db};
+    my $base = $new->{base};
 
     my @objlist = ();
@@ -54 +51 @@
         }
     } 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;
+        $self->{filter}{'attr'} = [ $c->req->param('attr') ];
+        $self->{filter}{'attrval'} = [ $c->req->param('attrval') ];
+        my @filter = $self->filter;
         @objlist = $base->search_objects($otype, @filter);
     } else {
@@ -62 +59 @@
     }
 
-    $c->stash->{objectslist} = \@objlist;
+    $self->{objectslist} = \@objlist;
 
     my $start = $c->req->param('start');
-    $c->stash->{uparams} = { %{ $c->req->params || {} } };
+    $self->{uparams} = { %{ $c->req->params || {} } };
     my %initials;
     my @sublist;
-    foreach (@{ $c->stash->{objectslist} }) {
+    foreach (@{ $self->{objectslist} }) {
         $initials{substr($_, 0, 1)} = 1;
         if ($start) {
@@ -76 +73 @@
         }
     }
-    $c->stash->{sublist} = [ @sublist ];
-    $c->stash->{initials} = [ sort keys %initials ];
+    $self->{sublist} = [ @sublist ];
+    $self->{initials} = [ sort keys %initials ];
 
-    $c->stash->{ofilter}
+    $self
 }
 
@@ -97 +94 @@
 sub current_value {
     my ($self) = @_;
-    my @vals = @{ $self->{c}->stash->{filter}{attrval} || [] };
-    my @fies = @{ $self->{c}->stash->{filter}{attr} || [] };
+    my @vals = @{ $self->{filter}{attrval} || [] };
+    my @fies = @{ $self->{filter}{attr} || [] };
     my @couples;
     foreach (@fies) {
@@ -143 +140 @@
 }
 
+sub objectslist {
+    my ($self) = @_;
+    warn $self->{objectslist};
+    $self->{objectslist};
+}
+
 =head1 AUTHOR
 

trunk/LATMOS-Accounts-Web/root/html/includes/list_objects.tt

@@ -1 +1 @@
 
+[% objectslist = ofilter.objectslist %]
 [% IF objectslist.size > 20 %]
 
-[% FOREACH initial = initials %]
+[% FOREACH initial = ofilter.initials %]
 [% IF c.req.param('start') == initial %]
 < [% initial %] >
 [% ELSE %]
-[% uparams.start = initial %]
-<a href="[% c.uri_for('/' _ c.forward('/obj_to_uri', [ ofilter.otype ]), uparams) %]">[% initial %]</a>
+[% ofilter.uparams.start = initial %]
+<a href="[% c.uri_for('/' _ c.forward('/obj_to_uri', [ ofilter.otype ]), ofilter.uparams) %]">[% initial %]</a>
 [% END %]
 [% END %]
@@ -27 +28 @@
 
 [% IF c.req.param('start') %]
-[% objectslist = sublist %]
+[% objectslist = ofilter.sublist %]
 [% END %]
 
 [% IF objectslist.size < 20 OR c.req.param('start') %]
 [% FOREACH name = objectslist %]
-[% object = db.get_object(ofilter.otype, name) %]
+[% object = c.model('Accounts').db.get_object(ofilter.otype, name) %]
 <tr>
     <td>

trunk/LATMOS-Accounts-Web/root/html/includes/select_objects_list.tt

@@ +1 @@
+[% objectslist = ofilter.objectslist %]
 <select name="obj" id="obj">
 [% IF objectslist.size > 1 %]
@@ -7 +8 @@
 
 [% IF objectslist.size < 20 %]
-[% object = db.get_object(ofilter.otype, name) %]
+[% object = c.model('Accounts').db.get_object(ofilter.otype, name) %]
 <option value="[% name | html %]">[% name | html %] ([%
 object.get_attributes('displayName') | html %])</option>