X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/adfcf4dd7d989d0560e2a8f6a590dd10c5a49a08..4446a6555bd54ca10a925340bb65c706678ac98e:/app/models/vote.rb

diff --git a/app/models/vote.rb b/app/models/vote.rb
index bef3502..719aa7b 100644
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -39,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
 
@@ -51,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
@@ -70,14 +73,19 @@ class Vote < ActiveRecord::Base
   end
 
   def confirm!
-    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
+    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