Merge from jdong, XMLRPC changes and testcases

[selectricity] / app / controllers / voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index 1b00b8b00b664ac46d6e9f15303fecf282c38189..e94f4a76f0faed8e1994d30356c41fef851b0387 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -1,5 +1,5 @@
 class VoterController < ApplicationController
-  layout 'vb'
+  layout 'main'
   model :voter
   model :vote
   model :election
@@ -7,7 +7,7 @@ class VoterController < ApplicationController
   def index
     password = params[:id]
     password = params[:vote][:password] if params[:vote]
-    if @voter = FullVoter.find_all( [ "password = ?", password ] )[0]
+    if @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]
       render :action => 'fullvote'
     end
   end
@@ -41,7 +41,7 @@ class VoterController < ApplicationController
   private
   def authenticate
     password = params[:id]
-    @voter = FullVoter.find_all( [ "password = ?", password ] )[0]
+    @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]
   end
 end