X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/7b649ccad8804580632c255b9f451482fdbbe32d..a7d8700239bf6f1d25cbbeedd57193b5035e88e5:/app/models/election.rb diff --git a/app/models/election.rb b/app/models/election.rb index a77f445..9c6337f 100644 --- 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|