X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/823d530ba46c1fb3518c4deef0081738503837eb..e8094b780ec0f30ac06b4de4c4f3a9c2bffe209d:/app/models/quick_vote.rb

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index 494f7ac..de78813 100644
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -1,8 +1,9 @@
 class QuickVote < Election
+  before_validation :build_candidate_names
   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={})
@@ -10,20 +11,14 @@ class QuickVote < Election
     self.startdate = Time.now
     self.active = 1
     self.anonymous = 1 unless self.anonymous
-    self.enddate = read_attribute( :enddate ) || \
-                   Time.now + 30.days - 1.second
-  end
-  
-  def enddate
-    super(30)
   end
   
   def validate
-    if not @raw_candidates or @raw_candidates.length < 2
+    if @candidate_names.length < 2
       errors.add(nil, "You must list at least two candidates.")
     end
-    
-    @raw_candidates.each do |c|
+
+    @candidate_names.each do |c|
       unless c.instance_of? String
         errors.add(nil, "Candidates must be strings")
         next
@@ -33,9 +28,11 @@ class QuickVote < Election
         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.")
@@ -47,15 +44,10 @@ class QuickVote < Election
     if name =~ /^(create|index|confirm|change|results)$/
       errors.add(:name, " is a reserved word.")
     end
-    
+
     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
-
-  def candidatelist=(candlist)
-    @raw_candidates = candlist
   end
 
   def name
@@ -66,9 +58,21 @@ class QuickVote < Election
     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?
-    @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