Add assert_cast_quickvote_succeeds/fails helper, and changed the fails helpers to...

[selectricity-live] / app / controllers / voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
old mode 100755 (executable)
new mode 100644 (file)
index 0e03a52..e94f4a7
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -1,5 +1,5 @@
 class VoterController < ApplicationController
 class VoterController < ApplicationController

-  layout 'hc'
+  layout 'main'

   model :voter
   model :vote
   model :election
   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]
   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
       render :action => 'fullvote'
     end
   end


@@ -41,7 +41,7 @@ class VoterController < ApplicationController
   private
   def authenticate
     password = params[:id]
   private
   def authenticate
     password = params[:id]

-    @voter = FullVoter.find_all( [ "password = ?", password ] )[0]
+    @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]

   end
 end
 
   end
 end