X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/7ea8b24f8b002feba79f92e5333f1ec5c6e9f929..192728d0e5facadf7e41ed737ca59e5c14123efd:/app/controllers/quickvote_controller.rb diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index e327ed6..58370f7 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -1,9 +1,9 @@ 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 @@ -12,7 +12,6 @@ class QuickvoteController < ApplicationController def create if params[:quickvote] @quickvote = QuickVote.new(params[:quickvote]) - # store the candidate grabbed through ajax and stored in flash @quickvote.candidatelist = flash[:candlist] @quickvote.description=CGI.escapeHTML(@quickvote.description) @@ -22,6 +21,7 @@ class QuickvoteController < ApplicationController @quickvote = @quickvote.reload render :action => 'success' else + raise ArgumentError.new(@quickvote.errors.inspect) flash.keep(:candlist) end @@ -52,14 +52,12 @@ class QuickvoteController < ApplicationController def index @election = QuickVote.ident_to_quickvote(params[:ident]) - # if the person has specified an election, we show them the voting # page. otherwise, we redirect back to main the page if @election - # 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 @@ -75,8 +73,8 @@ class QuickvoteController < ApplicationController @voter = QuickVoter.new @voter.election = @election @voter.session_id = session.session_id - - # create new vote and make it the defaulted sorted list + + # create new vote and make it the defaulted sorted list @voter.vote = Vote.new @voter.save @voter.vote.set_defaults! @@ -92,7 +90,7 @@ class QuickvoteController < ApplicationController 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 @@ -122,7 +120,7 @@ class QuickvoteController < ApplicationController 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