Merge from jdong

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

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