licensed under the AGPL

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

diff --git a/app/models/election.rb b/app/models/election.rb
index ce7a0bceaff624a73231b6892b6743b0a36bd5f7..cd809ab5b94e28a06c6ed4cdbaaaacaf4cc90148 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -23,7 +23,7 @@ class Election < ActiveRecord::Base
 
   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
@@ -91,14 +91,14 @@ class Election < ActiveRecord::Base
   #Calculate results if not in memcache
   def results
     # Assignment is intentional
-    if Cache and c = Cache.get("election_results:#{id}:#{self.votes.length}")
+    if defined? Cache and c = Cache.get("election_results:#{id}:#{self.votes.length}")
       @plurality_result = c['plurality']
       @approval_result = c['approval']
       @condorcet_result = c['condorcet']
       @ssd_result = c['ssd']
       @borda_result = c['borda']
       return c
-    elsif Cache
+    elsif defined? Cache
       # memcache is available, but missed.
       results = self.results!
       Cache.set("election_results:#{id}:#{self.votes.length}", results)