X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/a8006b0bf9687f8882c3073eca2e8b4ebc7cde4a..25ca86ba092b776dbee0af7d40383fb2e0836dbb:/app/models/election.rb?ds=sidebyside diff --git a/app/models/election.rb b/app/models/election.rb index 7343d72..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| @@ -57,7 +51,6 @@ class Election < ActiveRecord::Base def start_blockers reasons = [] - if self.candidates.length <= 1 reasons << "You must have at least two candidates." end