Merge remote branch 'remotes/deployment/master' into live

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index ccbbafe282bb2add4fc809c246f69a60b6bb04fb..3d811e622112f32ab59b6c5fc075a5a21d9c60da 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -239,7 +239,7 @@ class ElectionController < ApplicationController
   end
   
   def delete_voter
   end
   
   def delete_voter

-    voter = Voter.find( params[:id] )
+    voter = FullVoter.find( params[:id] )

     voter.destroy
   end
 
     voter.destroy
   end