Merge from head

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

diff --git a/app/models/election.rb b/app/models/election.rb
index a574139c535abc4f48b7ba5a210da7d918e5362d..9c6337fdcf56ff78d7ee1d63a04ba1bfedf23bf0 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -18,7 +18,7 @@ class Election < ActiveRecord::Base
   def initialize(params={})
     super
     self.enddate = read_attribute( :enddate ) || \
-                   Time.now + 14.days - 1.second
+                   Time.now + 30.days - 1.second
   end
 
   def other_methods
@@ -34,12 +34,6 @@ class Election < ActiveRecord::Base
     read_attribute( :startdate ) || Time.now
   end
 
-  def enddate=(date)
-    date += 1.day
-    date = Time.gm(*date)
-    super(date)
-  end
-
   def votes
     votes = Array.new
     self.voters.each do |voter|
@@ -57,7 +51,6 @@ class Election < ActiveRecord::Base
 
   def start_blockers
     reasons = []
-    debugger 
     if self.candidates.length <= 1
       reasons << "You must have at least two candidates."
     end