Started modifying the results page for final appearnces.

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

diff --git a/app/models/election.rb b/app/models/election.rb
index a574139c535abc4f48b7ba5a210da7d918e5362d..7fa138ef4c433b4aafc239cd573aaf04a31bb8fb 100644 (file)
--- 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|
@@ -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