X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/1620856a8a47219f3a2cbb5288137b11467886fc..d436b6b274166db559f06eb677cec930ccdb1af4:/app/controllers/quickvote_controller.rb diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index 8b853eb..0d9eb7b 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) @@ -52,11 +51,9 @@ 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, :conditions => ["session_id = ? and election_id = ?", @@ -75,8 +72,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!