X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/7b649ccad8804580632c255b9f451482fdbbe32d..e7df11018ea1e15f8671f948126632be3ac86e84:/app/models/election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index a77f445..7fa138e 100644
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -18,12 +18,12 @@ 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
     if election_method
-      @other_methods = ELECTION_TYPES.reject {|i| i == election_method}
+      @other_methods = ELECTION_TYPES.keys.reject {|i| i == election_method}
     else
       @other_methods = nil
     end
@@ -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|