Variety of small changes (mostly to properties) plus a few "in the

[selectricity] / app / models / quick_vote.rb

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
old mode 100644 (file)
new mode 100755 (executable)
index d6ab55b..ab97e61
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -16,17 +16,14 @@ 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
@@ -34,11 +31,7 @@ class QuickVote < Election
   end
 
   def reviewed?
-    if reviewed.to_i == 1
-      return true
-    else
-      false
-    end
+    reviewed.to_i == 1
   end
 
   def create_candidates