Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live

[selectricity] / app / models / vote.rb

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 98b5704e0aefce54a4ffc86861d2391e13357425..12dd64d763e1f9fbd47d0bb776c5d118684b1b0b 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.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 Vote < ActiveRecord::Base
   # relationships to other classes
   belongs_to :voter
@@ -21,7 +28,7 @@ class Vote < ActiveRecord::Base
       if rankings.empty?
         @votes = Array.new
       else
-        @votes = rankings.sort.collect { |ranking| ranking.candidate.id }
+        @votes = self.rankings.sort.collect { |ranking| ranking.candidate.id }
       end
     end
 
@@ -33,6 +40,9 @@ class Vote < ActiveRecord::Base
   end
 
   def save_rankings
+    self.votes # i need to initalize this before destroying rankings
+               # or else the ranks themselves show up as nil
+
     destroy_rankings
     self.votes.each_with_index do |candidate_id, index| 
       ranking = Ranking.new
@@ -51,19 +61,20 @@ class Vote < ActiveRecord::Base
     rankings.each { |ranking| ranking.destroy }
   end
 
-  def settime
-    self.time = Time.now
-    self.save
-  end
-
   def confirm!
-    self.confirmed = 1
-    self.save
-    
-    unless self.voter.election.quickvote?
-      token.destroy and token.reload if token
-      self.token = Token.new
+    if self.voter.election.candidates.length == self.rankings.length
+      self.confirmed = 1
+      self.time = Time.now
       self.save
+    
+      unless self.voter.election.quickvote?
+        token.destroy and token.reload if token
+        self.token = Token.new
+        self.save
+      end
+      return false
+    else
+      return true
     end
   end