projects
/
selectricity
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9086b07
)
Fix validation of candidate names
author
John Dong
<jdong@mit.edu>
Fri, 17 Aug 2007 21:57:17 +0000
(17:57 -0400)
committer
John Dong
<jdong@mit.edu>
Fri, 17 Aug 2007 21:57:17 +0000
(17:57 -0400)
app/models/quick_vote.rb
patch
|
blob
|
history
diff --git
a/app/models/quick_vote.rb
b/app/models/quick_vote.rb
index fef4ef86125bd98f3c2f91ed58a0795262004792..698dac3f02af15ad516918de69600c4e0bfe0f48 100644
(file)
--- a/
app/models/quick_vote.rb
+++ b/
app/models/quick_vote.rb
@@
-12,9
+12,23
@@
class QuickVote < Election
def validate
if not @raw_candidates or @raw_candidates.length < 2
def validate
if not @raw_candidates or @raw_candidates.length < 2
-
errors.add(nil, "You must list at least two candidates.")
+ errors.add(nil, "You must list at least two candidates.")
end
end
+ @raw_candidates.each do |c|
+ unless c.instance_of? String
+ errors.add(nil, "Candidates must be strings")
+ next
+ end
+ c.strip!
+ if c.length == 0
+ errors.add(nil, "Candidate name must not be empty")
+ next
+ end
+ end if @raw_candidates
+
+ errors.add(nil, "Candidates must all be unique") if @raw_candidates and @raw_candidates.uniq!
+
if name =~ /[^A-Za-z0-9]/
errors.add(:name, "must only include numbers and letters.")
end
if name =~ /[^A-Za-z0-9]/
errors.add(:name, "must only include numbers and letters.")
end
Benjamin Mako Hill
||
Want to submit a patch?