X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/75091532075247ae9c47164ea883f4fe803eddf4..c65b1e11059c5cf510b54c785d4a246215058f70:/app/models/quick_vote.rb

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index fba31a8..8d4e6e8 100644
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -16,18 +16,13 @@ class QuickVote < Election
   
   def initialize(params={})
     super
-    self.enddate =  DateTime.now + 30
+    self.enddate =  Time.now + 30.days
     self.active = 1
     self.anonymous = 1
-    self.quickvote = 1
   end
 
-  def candidatelist=(candstring='')
-    @raw_candidates = candstring.split(';').collect {|cand| cand.strip }
-  end
-
-  def candidatelist
-    @raw_candidates.join("; ")
+  def candidatelist=(candlist)
+    @raw_candidates = candlist
   end
 
   def name
@@ -41,7 +36,6 @@ class QuickVote < Election
   def create_candidates
     @raw_candidates.each do |name|
       candidate = Candidate.new({:name => name})
-      candidate.save
       self.candidates << candidate
     end
   end