Changeset 224

Timestamp:

04/20/09 05:45:33 (15 years ago)

Author:

nanardon

Message:

• always allow to remap ballot value (#12)

Location:

trunk

Files:

• lib/Vote/Controller/Admin.pm (modified) (1 diff)
• lib/Vote/DB/Poll.pm (modified) (2 diffs)
• root/templates/admin/includes/ballot_validation.tt (modified) (1 diff)

trunk/lib/Vote/Controller/Admin.pm

@@ -122 +122 @@
 
     /^AFTER$/ and do {
-        if ($c->req->param('mapfrom') && $c->req->param('mapto')) {
+        if ($c->req->param('mapfrom')) {
             $poll->map_value(
-                $id,
                 $c->req->param('mapfrom'),
-                $c->req->param('mapto'),
+                $c->req->param('mapto') || undef,
             );
         }

trunk/lib/Vote/DB/Poll.pm

@@ -573 +573 @@
         select value from ballot join ballot_item
         on ballot.id = ballot_item.id
-        where poll = ? and fromlist = false and corrected is null
+        where poll = ? and fromlist = false
         group by value order by value
         }
@@ -604 +604 @@
 }
 
+sub value_map_to {
+    my ($self, $from) = @_;
+    my $sth = $self->db->prepare_cached(
+        q{select "to" from ballot_map where poll = ? and "from" = ?}
+    );
+    $sth->execute($self->voteid, $from);
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    $res->{to}
+}
+
 sub map_value {
     my ($self, $from, $to) = @_;
 
-    my $sth = $self->db->prepare_cached(
-        q{
-        insert into ballot_map (poll, "from", "to") values (?,?,?)
-        }
-    );
-
-    $sth->execute($self->voteid, $from, $to) or $self->rollback;
+    if (!$to) {
+        my $sth = $self->db->prepare_cached(
+            q{delete from ballot_map where poll = ? and "from" = ?}
+        );
+        $sth->execute($self->voteid, $from);
+    } else {
+        my $sthup = $self->db->prepare_cached(
+            q{update ballot_map set "to" = ? where poll = ? and "from" = ?}
+        );
+        if ($sthup->execute($to, $self->voteid, $from) == 0) {
+            my $sth = $self->db->prepare_cached(
+                q{
+                insert into ballot_map (poll, "from", "to") values (?,?,?)
+                }
+            );
+
+            $sth->execute($self->voteid, $from, $to) or $self->rollback;
+        }
+    }
     $self->commit;
 }

trunk/root/templates/admin/includes/ballot_validation.tt

@@ -16 +16 @@
     <input type="hidden" name="mapfrom" value="[% untrusted | html %]">
     <select name="mapto">
+    <option></option>
     [% FOREACH v = poll.ballot_values %]
         [% NEXT IF v == untrusted %]
-        <option>[% v | html %]</options>
+        <option[% " selected" IF poll.value_map_to(untrusted) == v %]>[% v | html %]</options>
     [% END %]
     </select>