merged in changes from devel

[selectricity] / app / models / quick_vote.rb

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index e0bab76fccf4a8654dffabb461eb105aadd6a1fd..de78813153025698796b8ce274f711072cf984e5 100644 (file)
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -11,8 +11,6 @@ class QuickVote < Election
     self.startdate = Time.now
     self.active = 1
     self.anonymous = 1 unless self.anonymous
     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 validate
   end
   
   def validate