Fix more DeprecationWarnings

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index e327ed6a17a55ed967e8f24120299554bc640794..41d0dc3616050ef909e39ebbcaa2eef7363da12f 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -1,9 +1,9 @@
 class QuickvoteController < ApplicationController
   layout 'main'
 class QuickvoteController < ApplicationController
   layout 'main'

-  model :quick_voter
-  model :quick_vote
-  model :vote
-  model :election
+  require_dependency "quick_voter"
+  require_dependency "quick_vote"
+  require_dependency "vote"
+  require_dependency "election"

 
   #############################################################
   # the following methods pertain to creating quickvotes
 
   #############################################################
   # the following methods pertain to creating quickvotes


@@ -59,7 +59,7 @@ class QuickvoteController < ApplicationController
 
       # look to see that the voter has been created and has voted in
       # this election, and has confirmed their vote
 
       # look to see that the voter has been created and has voted in
       # this election, and has confirmed their vote

-      @voter = QuickVoter.find_all(["session_id = ? and election_id = ?",
+      @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?",

                                   session.session_id, @election.id])[0]
 
       # if the voter has not voted we destroy them
                                   session.session_id, @election.id])[0]
 
       # if the voter has not voted we destroy them


@@ -92,7 +92,7 @@ class QuickvoteController < ApplicationController
     election = QuickVote.ident_to_quickvote(params[:ident])
 
     # find out who the voter is for this election
     election = QuickVote.ident_to_quickvote(params[:ident])
 
     # find out who the voter is for this election

-    @voter = QuickVoter.find_all(["session_id = ? and election_id = ?", 
+    @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", 

                                  session.session_id, election.id])[0]
   
     if not @voter
                                  session.session_id, election.id])[0]
   
     if not @voter


@@ -122,7 +122,7 @@ class QuickvoteController < ApplicationController
   end
  
   def change
   end
  
   def change

-    voter = QuickVoter.find_all(["session_id = ?", session.session_id])[0]
+    voter = QuickVoter.find(:all, :conditions => ["session_id = ?", session.session_id])[0]

     voter.destroy
     redirect_to quickvote_url( :ident => params[:ident] )
   end
     voter.destroy
     redirect_to quickvote_url( :ident => params[:ident] )
   end