Changeset 75

Timestamp:

03/18/09 17:33:20 (15 years ago)

Author:

nanardon

Message:

• fix #8: allow to change voting list during poll

Location:

trunk

Files:

• lib/Vote/Controller/Admin.pm (modified) (4 diffs)
• root/templates/admin/default.tt (modified) (1 diff)

trunk/lib/Vote/Controller/Admin.pm

@@ -56 +56 @@
     $c->stash->{page}{title} = $c->model('Vote')->vote_info($id)->{label} . ': Administration';
 
-    if ($vote->vote_status($id) eq 'BEFORE') {
-        if (my ($upload) = $c->req->upload('votinglist')) {
-            $vote->voting_from_file(
-                $id,
-                $upload->fh,
-                $c->req->param('delete'),
-            ) and $vote->db->commit;
-        } elsif ($c->req->param('addch')) {
+    warn $vote->vote_status($id);
+    for ($vote->vote_status($id) || '') {
+    /^BEFORE$/ and do {
+        if ($c->req->param('addch')) {
             $vote->vote_add_choice($id, $c->req->param('addch'))
                 and $vote->db->commit;
@@ -85 +81 @@
                 qw(label description start end choice_count free_choice)
             ) and $vote->db->commit;
+        }
+    };
+
+    /^(BEFORE|RUNNING)$/ and do {
+        warn "XX";
+        if (my ($upload) = $c->req->upload('votinglist')) {
+            $vote->voting_from_file(
+                $id,
+                $upload->fh,
+                $c->req->param('delete'),
+            ) and $vote->db->commit;
         } elsif($c->req->param('delvoting')) {
             $vote->delete_voting($c->req->param('delvoting'))
@@ -96 +103 @@
             });
         }
-    } elsif ($vote->vote_status($id) eq 'AFTER') {
+    };
+
+    /^AFTER$/ and do {
         if ($c->req->param('mapfrom') && $c->req->param('mapto')) {
             $vote->vote_map_value(
@@ -115 +124 @@
             }
         }
-    } else {
-        # can't modify vote after date
-        $c->stash->{template} = 'admin/denied.tt';
-        return;
+    };
     }
 

trunk/root/templates/admin/default.tt

@@ -66 +66 @@
 </tr>
 </table>
-
+[% ELSE %]
+[% INCLUDE 'includes/poll.tt' %]
+[% END %]
 <hr>
 
+[% IF vote.vote_status(voteid) != 'AFTER' %]
 Liste des votants :
 <table border="1">