Merge jdong

[selectricity] / app / controllers / voter_controller.rb

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index 779e83f15aa8bc6eb8862fc0420e34685d241112..f4e0e7e7d782e9d67c13518d15758f616b8c9764 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -1,13 +1,13 @@
 class VoterController < ApplicationController
   layout 'main'
 class VoterController < ApplicationController
   layout 'main'

-  model :voter
-  model :vote
-  model :election
+  require_dependency "voter"
+  require_dependency "vote"
+  require_dependency "election"

 
   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