Changeset 225

Timestamp:

06/05/09 10:28:37 (15 years ago)

Author:

nanardon

Message:

• use session to remember settings in massedit

Location:

LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Web/Controller/MassEdit.pm (modified) (2 diffs)
• root/html/includes/filter.tt (modified) (3 diffs)

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

@@ -44 +44 @@
 }
 
+sub filter : Private {
+    my ( $self, $c ) = @_;
+    my $otype = $c->stash->{filter}->{otype} or return;
+
+    $c->stash->{db} ||= $c->model('Accounts')->db;
+    my $base = $c->stash->{db};
+    if ($c->req->param('attrval')) {
+        $c->stash->{filter}{attrval} = [ $c->req->param('attrval') ];
+        $c->stash->{filter}{attr} = [ $c->req->param('attr') ];
+    } else {
+        # avoid undef
+        $c->stash->{filter}{attrval} ||= [];
+        $c->stash->{filter}{attr} ||= [];
+    }
+    
+    my %filter = map  {
+        $c->stash->{filter}{attr}[$_] && $c->stash->{filter}{attrval}[$_]
+        ? ($c->stash->{filter}{attr}[$_] => $c->stash->{filter}{attrval}[$_])
+        : ()
+    } (0 .. $#{ $c->stash->{filter}{attr} || []});
+    $c->stash->{objectslist} = [
+        map { $base->get_object($otype, $_) }
+        (%filter
+            ? ($base->search_objects($otype, %filter) )
+            : ($base->list_objects($otype) ))
+    ]
+}
+
 =head2 end
 

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

@@ -3 +3 @@
 use strict;
 use warnings;
-use base 'Catalyst::Controller';
+use base 'LATMOS::Accounts::Web::Controller';
 
 =head1 NAME
@@ -26 +26 @@
 
     my $base = $c->stash->{db} = $c->model('Accounts')->db;
-    if (my $otype = $c->req->param('otype')) {
-        my %filter = map  {
-            $c->req->params->{attr}[$_] && $c->req->params->{attrval}[$_]
-            ? ($c->req->params->{attr}[$_] => $c->req->params->{attrval}[$_])
-            : ()
-        } (0 .. $#{ $c->req->params->{attr} || []});
-        $c->stash->{objectslist} = [
-            map { $base->get_object($otype, $_) }
-            (%filter
-            ? ($base->search_objects($otype, %filter) )
-            : ($base->list_objects($otype) ))
-        ]
+    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->session->{massedit}{attrcol} = undef;
+    } else {
+        $c->stash->{filter} = $c->session->{filter};
+        if ($c->req->param('attrcol')) {
+            $c->session->{massedit}{attrcol} = [ $c->req->param('attrcol') ];
+        } else {
+            $c->req->params->{attrcol} = $c->session->{massedit}{attrcol};
+        }
     }
+    $c->forward('filter');
+    $c->session->{filter} = $c->stash->{filter};
 }
 

LATMOS-Accounts-Web/root/html/includes/filter.tt

@@ -1 +1 @@
 <!-- $Id$ -->
 <p>Filtre:</p>
-<form action="[% formuri %]" method="POST">
+<form action="[% c.action.namespace %]" method="POST">
 <input type="hidden" name="otype" value="[% otype | html %]">
 [% FOREACH item = [0, 1, 2 ] %]
@@ -13 +13 @@
 <option value=""></option>
 [% FOREACH f = db.list_canonical_fields(otype, 'r') %]
-<option value="[% f | html %]" [% ' selected="1"' IF c.req.params.attr.$item == f %]>
+<option value="[% f | html %]" [% ' selected="1"' IF filter.attr.$item == f %]>
     [% c.model('AttrForms').attr_label(f) | html %]
 </option>
@@ -19 +19 @@
 </select>
 </td>
-<td><input type="text" name="attrval" value="[% c.req.params.attrval.$item | html %]"></td></tr>
+<td><input type="text" name="attrval" value="[% filter.attrval.$item | html %]"></td></tr>
 [% IF loop.last %]
 </table>