projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big commit includes:
[selectricity]
/
app
/
models
/
quick_vote.rb
diff --git
a/app/models/quick_vote.rb
b/app/models/quick_vote.rb
index 494f7ac364bfb6b7dd53226bce0f138f05c10c60..bd390519331e5e2d62c82d69223e9f5397daf664 100644
(file)
--- a/
app/models/quick_vote.rb
+++ b/
app/models/quick_vote.rb
@@
-1,8
+1,10
@@
class QuickVote < Election
class QuickVote < Election
+ before_validation :build_candidate_names
after_validation :create_candidates
validates_uniqueness_of :name
validates_presence_of :name
after_validation :create_candidates
validates_uniqueness_of :name
validates_presence_of :name
- attr_accessor :raw_candidates
+
+ attr_accessor :candidate_names
attr_accessor :reviewed
def initialize(params={})
attr_accessor :reviewed
def initialize(params={})
@@
-14,16
+16,12
@@
class QuickVote < Election
Time.now + 30.days - 1.second
end
Time.now + 30.days - 1.second
end
- def enddate
- super(30)
- end
-
def validate
def validate
- if
not @raw_candidates or @raw_candidat
es.length < 2
+ if
@candidate_nam
es.length < 2
errors.add(nil, "You must list at least two candidates.")
end
errors.add(nil, "You must list at least two candidates.")
end
-
- @
raw_candidat
es.each do |c|
+
+ @
candidate_nam
es.each do |c|
unless c.instance_of? String
errors.add(nil, "Candidates must be strings")
next
unless c.instance_of? String
errors.add(nil, "Candidates must be strings")
next
@@
-33,9
+31,11
@@
class QuickVote < Election
errors.add(nil, "Candidate name must not be empty")
next
end
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!
+ end if @candidate_names
+
+ if @candidate_names and @candidate_names.uniq!
+ errors.add(nil, "Candidates must all be unique")
+ end
if name =~ /[^A-Za-z0-9]/
errors.add(:name, "must only include numbers and letters.")
if name =~ /[^A-Za-z0-9]/
errors.add(:name, "must only include numbers and letters.")
@@
-47,15
+47,10
@@
class QuickVote < Election
if name =~ /^(create|index|confirm|change|results)$/
errors.add(:name, " is a reserved word.")
end
if name =~ /^(create|index|confirm|change|results)$/
errors.add(:name, " is a reserved word.")
end
-
+
if enddate < startdate
if enddate < startdate
- errors.add(nil, "QuickVotes can't end before they start
!
")
+ errors.add(nil, "QuickVotes can't end before they start")
end
end
-
- end
-
- def candidatelist=(candlist)
- @raw_candidates = candlist
end
def name
end
def name
@@
-66,9
+61,21
@@
class QuickVote < Election
reviewed.to_i == 1
end
reviewed.to_i == 1
end
+ def build_candidate_names
+ @candidate_names ||= []
+ if @candidate_names.empty? and not candidates.empty?
+ @candidate_names = candidates.collect {|c| c.name}
+ end
+ end
+
def create_candidates
return unless errors.empty?
def create_candidates
return unless errors.empty?
- @raw_candidates.each do |name|
+
+ # delete the candidates
+ candidates.each {|c| c.destroy}
+
+ # create the new list based on the names
+ @candidate_names.each do |name|
candidate = Candidate.new({:name => name})
self.candidates << candidate
end
candidate = Candidate.new({:name => name})
self.candidates << candidate
end
Benjamin Mako Hill
||
Want to submit a patch?