Changeset 110

Timestamp:

03/26/09 16:24:31 (15 years ago)

Author:

nanardon

Message:

• show values detected as submited twice (#15)

File:

• trunk/lib/Vote/Controller/Ballot.pm (modified) (2 diffs)

trunk/lib/Vote/Controller/Ballot.pm

@@ -82 +82 @@
     $c->request->parameters->{fsbal} = $c->stash->{fsbal};
 
-    my @sbalval = grep { $_ } map { $choices{$_} } $c->req->param('sbal');
+    my @sbalval = grep { $_ } map { lc($choices{$_} || '') } $c->req->param('sbal');
 
     if (scalar(@sbalval) + scalar(@{$c->stash->{fsbal} || []})
@@ -93 +93 @@
     {
         my %uniq;
-        $uniq{lc($_)} = 1 foreach(@sbalval, @{$c->stash->{fsbal} || []});
-        if (scalar(keys %uniq) != scalar(@sbalval) + scalar(@{$c->stash->{fsbal} || []})) {
+        foreach(@sbalval, @{$c->stash->{fsbal} || []}) {
+            $uniq{lc($_)} ||= 0; # avoid undef
+            $uniq{lc($_)}++;
+        }
+        my @twices = grep { $uniq{$_} > 1 } (sort keys %uniq);
+        if (scalar(@twices)) {
             $c->req->parameters->{'ballot'} = '';
-            $c->stash->{vote_error} = 'Une valeur est en double';
+            $c->stash->{vote_error} = 'Une ou plusieurs valeurs sont en double: ' .
+                join(' ,', map { qq'"$_"' } @twices);
             return;
         }