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

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index b57abaa40dfba69ab01d3912023e183bda8af771..cd16743fcc16e2095f46b1eff115c47f2cd51d39 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -165,10 +165,12 @@ class QuickvoteController < ApplicationController
       @voter.save
       
       # toggle the confirmation bit      
       @voter.save
       
       # toggle the confirmation bit      

-      @voter.vote.confirm!
-     
-      @voter.reload
-      render :action => 'thanks'
+      if @voter.vote.confirm!
+        @voter.reload
+        render :action => 'thanks'
+      else
+        redirect_to :action => 'index'
+      end

     end
   end
  
     end
   end
  

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index afc01039b8e535b7733844f44bf0b5429ed64b2e..4ff8140cae14929891528dd43f4b48b87ea4a42e 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -128,16 +128,18 @@ class VoterController < ApplicationController
 
   def confirm
     if authenticate
 
   def confirm
     if authenticate

-      @voter.vote.confirm!
-
-      if @voter.election.embeddable? and params[:embed] == "true" \
-        and @voter.election.early_results?
-        redirect_to :action => :results, :id => @password, :embed => 'true'
+      if @voter.vote.confirm!
+        if @voter.election.embeddable? and params[:embed] == "true" \
+          and @voter.election.early_results?
+          redirect_to :action => :results, :id => @password, :embed => 'true'
+        else
+          render :action => 'thanks'
+        end

       else
       else

-        render :action => 'thanks'
+        redirect_to :action => 'index'

       end
     else
       end
     else

-      redirect_to :action => 'index'
+        redirect_to :action => 'index'

     end
   end
   
     end
   end
   

diff --git a/app/models/vote.rb b/app/models/vote.rb
index d3010dfeac754978883be4d75a9cc755ee5dca90..719aa7b33f9cb7163049b3bc27389d49c4605251 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -73,14 +73,19 @@ class Vote < ActiveRecord::Base
   end
 
   def confirm!
   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
       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
 
     end
   end