X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/75091532075247ae9c47164ea883f4fe803eddf4..b31720d9ce48c5f46e2cb39242429a640f90fb40:/app/controllers/voter_controller.rb?ds=inline diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb index d2529f8..0e03a52 100644 --- a/app/controllers/voter_controller.rb +++ b/app/controllers/voter_controller.rb @@ -1,5 +1,5 @@ class VoterController < ApplicationController - layout 'vb' + layout 'hc' model :voter model :vote model :election @@ -30,26 +30,7 @@ class VoterController < ApplicationController end def confirm - if params[:votename] - if Voter.find_all( ["session_id = ?", session.session_id ])[0] - flash[:notice] = "You have already voted!" - redirect_to quickvote_url( :votename => params[:votename] ) - else - @voter = QuickVoter.new() - @voter.election = Election.find_all( [ "name = ?", - params[:votename] ] )[0] - @voter.session_id = session.session_id - @voter.save - @voter.reload - - @voter.vote = Vote.new - @voter.vote.votestring = params[:vote][:votestring] - @voter.vote.save - @voter.vote.confirm! - render :action => 'thanks' - end - - elsif authenticate + if authenticate @voter.vote.confirm! render :action => 'thanks' else @@ -57,11 +38,6 @@ class VoterController < ApplicationController end end - def quickvote - @voter = QuickVoter.new - @voter.election = Election.find_all( [ "name = ?", params[:votename] ] )[0] - end - private def authenticate password = params[:id]