fix bug that allowed votes with more rankings than candidates to be recorded

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

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 98b5704e0aefce54a4ffc86861d2391e13357425..719aa7b33f9cb7163049b3bc27389d49c4605251 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -1,3 +1,21 @@
+# 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: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+
 class Vote < ActiveRecord::Base
   # relationships to other classes
   belongs_to :voter
@@ -21,7 +39,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 +51,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 +72,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