updated the git ignore file

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

diff --git a/app/models/election.rb b/app/models/election.rb
index cd809ab5b94e28a06c6ed4cdbaaaacaf4cc90148..a3e939424ac11099ba5c1f6e70dd5b0989b2b405 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -1,3 +1,10 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software. Please see the COPYING file for
+# details.
+

 class Election < ActiveRecord::Base
   has_many :candidates
   has_many :voters
 class Election < ActiveRecord::Base
   has_many :candidates
   has_many :voters


@@ -55,7 +62,7 @@ class Election < ActiveRecord::Base
       reasons << "You must have at least two candidates."
     end
     
       reasons << "You must have at least two candidates."
     end
     

-    if self.voters.length <= 1
+    if self.voters.length <= 1 and self.authenticated?

       reasons << "You must have at least two voters."
     end
 
       reasons << "You must have at least two voters."
     end
 


@@ -68,7 +75,7 @@ class Election < ActiveRecord::Base
   end
   
   def quickvote?
   end
   
   def quickvote?

-    self.class == 'QuickVote'
+    self.class == QuickVote

   end
 
   def active?
   end
 
   def active?


@@ -79,6 +86,14 @@ class Election < ActiveRecord::Base
     active == 2
   end
 
     active == 2
   end
 

+  def authenticated?
+    authenticated
+  end
+
+  def kiosk?
+    kiosk
+  end
+  

   def shortdesc
     shortdesc = description.split(/\n/)[0]
   end
   def shortdesc
     shortdesc = description.split(/\n/)[0]
   end


@@ -91,14 +106,14 @@ class Election < ActiveRecord::Base
   #Calculate results if not in memcache
   def results
     # Assignment is intentional
   #Calculate results if not in memcache
   def results
     # Assignment is intentional

-    if defined? Cache and c = Cache.get("election_results:#{id}:#{self.votes.length}")
+    if 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
       @plurality_result = c['plurality']
       @approval_result = c['approval']
       @condorcet_result = c['condorcet']
       @ssd_result = c['ssd']
       @borda_result = c['borda']
       return c

-    elsif defined? Cache
+    elsif Cache

       # memcache is available, but missed.
       results = self.results!
       Cache.set("election_results:#{id}:#{self.votes.length}", results)
       # memcache is available, but missed.
       results = self.results!
       Cache.set("election_results:#{id}:#{self.votes.length}", results)