X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/e7bff908a0ea52b62e4fa0dc13be0293a51dcbb1..83a39529b634c0344a7884d5813e3f7e1a7dbcb4:/app/controllers/voter_controller.rb diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb index 9ba619c..1634ccd 100644 --- a/app/controllers/voter_controller.rb +++ b/app/controllers/voter_controller.rb @@ -12,6 +12,9 @@ class VoterController < ApplicationController require_dependency "vote" require_dependency "election" + before_filter :authenticate, :except => [:index, :login, :reminder, + :kiosk_ready] + def index if params[:election_id] @election = Election.find(params[:election_id]) @@ -80,54 +83,23 @@ class VoterController < ApplicationController end end - def pref_tables - if authenticate - @election = @voter.election - @results = @election.results - @candidates = {} - @election.candidates.each {|c| @candidates[c.id] = c} - @names = @election.names_by_id - render :template => 'common/pref_tables', :layout => 'basic' - else - redirect_to :action => 'index' - end - end - - def details - if authenticate - @election = @voter.election - @votes = @election.votes.select {|v| v.confirmed? }.shuffle - @voters = @votes.collect {|v| v.voter}.shuffle - render :action => 'details' - else - redirect_to :action => 'index' - end - end - def review - if authenticate - @voter.vote.time = Time.now - @voter.vote.save - @voter.reload - else - redirect_to :action => 'index' - end + @voter.vote.time = Time.now + @voter.vote.save + @voter.reload end def confirm - if authenticate - @voter.vote.confirm! - - if @voter.election.embeddable? and params[:embed] == "true" \ - and @voter.election.early_results? - redirect_to :action => :results, :id => @password, :embed => 'true' - elsif @voter.election.kiosk and params[:kiosk] = "true" - redirect_to :action => "kiosk_ready", :id => @password, :kiosk => true - else - render :action => 'thanks' - end + @voter.vote.confirm! + + if @voter.election.embeddable? and params[:embed] == "true" \ + and @voter.election.early_results? + redirect_to :action => :results, :id => @password, :embed => 'true' + elsif not(@voter.election.verifiable) \ + and @voter.election.kiosk and params[:kiosk] == "true" + redirect_to :action => "kiosk_ready", :id => @password, :kiosk => true else - redirect_to :action => 'index' + render :action => 'thanks' end end @@ -143,19 +115,12 @@ class VoterController < ApplicationController end def results - if authenticate and - (@voter.election.early_results? \ - or @voter.election.enddate < Time.now) + if @voter.election.early_results? \ + or @voter.election.enddate < Time.now @election = @voter.election - # compute and display results - - @results = @election.results - @candidates = {} - @election.candidates.each {|c| @candidates[c.id] = c} - @names = @election.names_by_id - - @sidebar_content = render_to_string(:partial => 'results_sidebar') + @sidebar_content = render_to_string(:partial => 'full_results_sidebar') + #look for custom theme, and assign to instance variabels for widget use if @election.embed_custom_string @top_bar = SkinPicture.find(:first, @@ -172,13 +137,23 @@ class VoterController < ApplicationController if @election.embeddable? and params[:embed] == "true" render :template => 'embed/results', :layout => 'embed' else - render :action => 'results' + render :template => 'common/results' end else redirect_to :action => 'index' end end + def pref_tables + @election = @voter.election + render :template => 'common/pref_tables_wrapper', :layout => 'basic' + end + + def details + @election = @voter.election + render :template => 'common/details' + end + def kiosk_ready reset_session @@ -193,21 +168,25 @@ class VoterController < ApplicationController if password == "open" election = Election.find(params[:format]) - # check to see if the person has voted before - unless election.authenticated? + # if it's not actually open, lets redirect + if election.authenticated + redirect_to :action => 'index' + + # otherwise, lets see if they've before + else @voter = OpenVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", session.session_id, election.id])[0] - @password = "open." + election.id.to_s - end - # if it's ready for kiosk_mode, then we create and authenticate - unless @voter and params[:action] == 'kiosk_ready' \ - and election.kiosk - - # this is maybe not quite as a dry as it should be - @voter = OpenVoter.new unless @voter + # when (a) there is no voter or (b) when there is a voter but + # it's kiosk mode on the right page, rewrite witha blank voter + if not(@voter) \ + or (params[:action] == 'kiosk_ready' and election.kiosk) + @voter = OpenVoter.new unless @voter + end + # now that we have a voter (one way or another), set things + # right @voter.election = election @voter.session_id = session.session_id @password = "open." + election.id.to_s @@ -216,9 +195,13 @@ class VoterController < ApplicationController else @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0] - @password = @voter.password + + if @voter + @password = @voter.password + else + redirect_to :Action => 'index' + end end - @voter end end