Changed properties to remove unecessary exectables.

[selectricity-live] / app / models / quick_vote.rb

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index d6ab55b124dd2daa328b7452c80880975b553a31..8d4e6e82141f8b8c67dab67d0103c170a97f0324 100644 (file)
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -16,17 +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
   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
@@ -34,17 +30,12 @@ class QuickVote < Election
   end
 
   def reviewed?
-    if reviewed.to_i == 1
-      return true
-    else
-      false
-    end
+    reviewed.to_i == 1
   end
 
   def create_candidates
     @raw_candidates.each do |name|
       candidate = Candidate.new({:name => name})
-      candidate.save
       self.candidates << candidate
     end
   end