Changeset 29 for trunk/lib

Timestamp:

03/14/09 18:49:17 (15 years ago)

Author:

nanardon

Message:

• admin cannit make ballot as valid/invalid

Location:

trunk/lib/Vote

Files:

• Controller/Admin.pm (modified) (1 diff)
• Model/Vote.pm (modified) (1 diff)

trunk/lib/Vote/Controller/Admin.pm

@@ -30 +30 @@
     my ( $self, $c, undef, $id ) = @_;
     $c->stash->{voteid} = $id;
+    my $vote = $c->model('Vote');
 
-    # can't modify vote after date
-    if ($c->model('Vote')->vote_status($id) ne 'BEFORE') {
+    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')) {
+            $vote->vote_add_choice($id, $c->req->param('addch'))
+                and $vote->db->commit;
+        } elsif ($c->req->param('delch')) {
+            $vote->delete_choice($c->req->param('delch'))
+                and $vote->db->commit;
+        } elsif ($c->req->param('label')) {
+            $vote->vote_param(
+                $id,
+                map { $_ => ($c->req->param($_) || undef) }
+                qw(label description start end choice_count free_choice)
+            ) and $vote->db->commit;
+        } elsif($c->req->param('delvoting')) {
+            $vote->delete_voting($c->req->param('delvoting'))
+                and $vote->db->commit;
+        } elsif ($c->req->param('mail')) {
+            $vote->addupd_voting($id, $c->req->param('id'), $c->req->param('mail'))
+                and $vote->db->commit;
+        } elsif($c->req->param('mailpasswd')) {
+            $vote->mail_passwd_ifnul($id);
+        }
+    } elsif ($vote->vote_status($id) eq 'AFTER') {
+        foreach my $bid ($vote->list_vote_ballot_needvalid($id)) {
+            if (!$c->req->param($bid)) {
+                next;
+            } elsif($c->req->param($bid) eq 'invalid') {
+                $vote->mark_ballot_invalid($bid, 1);
+                $vote->db->commit;
+            } elsif($c->req->param($bid) eq 'valid') {
+                $vote->mark_ballot_invalid($bid, 0);
+                $vote->db->commit;
+            }
+        }
+    } else {
+        # can't modify vote after date
         $c->stash->{template} = 'admin/denied.tt';
         return;
     }
 
-    my $vote = $c->model('Vote');
-    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')) {
-        $vote->vote_add_choice($id, $c->req->param('addch'))
-            and $vote->db->commit;
-    } elsif ($c->req->param('delch')) {
-        $vote->delete_choice($c->req->param('delch'))
-            and $vote->db->commit;
-    } elsif ($c->req->param('label')) {
-        $vote->vote_param(
-            $id,
-            map { $_ => ($c->req->param($_) || undef) }
-            qw(label description start end choice_count free_choice)
-        ) and $vote->db->commit;
-    } elsif($c->req->param('delvoting')) {
-        $vote->delete_voting($c->req->param('delvoting'))
-            and $vote->db->commit;
-    } elsif ($c->req->param('mail')) {
-        $vote->addupd_voting($id, $c->req->param('id'), $c->req->param('mail'))
-            and $vote->db->commit;
-    } elsif($c->req->param('mailpasswd')) {
-        $vote->mail_passwd_ifnul($id);
-    }
 }
 

trunk/lib/Vote/Model/Vote.pm

@@ -574 +574 @@
 }
 
+sub mark_ballot_invalid {
+    my ($self, $ballotid, $invalid) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{update ballot set invalid = ? where id = ?}
+    );
+
+    $sth->execute($invalid ? 't' : 'f', $ballotid);
+}
+
 sub ballot_items {
     my ($self, $ballotid) = @_;