X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/c5fda1e5174238779afd496014379d6446d1e3c1..75091532075247ae9c47164ea883f4fe803eddf4:/app/models/vote.rb

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 82f34a9..7678f54 100644
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -36,7 +36,7 @@ class Vote < ActiveRecord::Base
     destroy_rankings
     self.votes.each_with_index do |candidate, index| 
       ranking = Ranking.new
-      ranking.rank = index + 1
+      ranking.rank = index
       ranking.candidate =  Candidate.find(candidate)
       self.rankings << ranking
     end
@@ -49,18 +49,16 @@ class Vote < ActiveRecord::Base
   def confirm!
     self.confirmed = 1
     self.save
-
-    token.destroy and token.reload if token
-    self.token = Token.new
-    self.save
+    
+    unless self.voter.election.quickvote?
+      token.destroy and token.reload if token
+      self.token = Token.new
+      self.save
+    end
   end
 
   def confirm?
-    if confirm == 1
-      return true
-    else 
-      return false
-    end
+    confirmed == 1
   end
   
   def votestring=(string="")