X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/eed173db706db097ec48a83059d9879a56e2dd4b..18e855dc667a8cc547c687bb6e4341e84292202b:/app/controllers/quickvote_controller.rb?ds=inline diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index eef3402..4b3c0c9 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -1,4 +1,12 @@ +# Selectricity: Voting Machinery for the Masses +# Copyright (C) 2007, 2008 Benjamin Mako Hill +# Copyright (C) 2007 Massachusetts Institute of Technology +# +# This program is free software. Please see the COPYING file for +# details. + class QuickvoteController < ApplicationController + helper :sparklines layout 'main' require_dependency "quick_voter" require_dependency "quick_vote" @@ -36,6 +44,7 @@ class QuickvoteController < ApplicationController #Give registered users additional QuickVote functionality @quickvote.user_id = session[:user][:id] if session[:user] + @quickvote.create_candidates # try to save, if it fails, show the page again (the flash should # still be intact @@ -76,7 +85,7 @@ class QuickvoteController < ApplicationController end end flash.keep(:candidate_names) - render_partial 'candidate_list' + render :partial => 'candidate_list' end ############################################################# @@ -88,6 +97,13 @@ class QuickvoteController < ApplicationController # if the person has specified an election, we show them the voting # page. otherwise, we redirect back to main the page if @election + + # if the election is over, redirect to the the results page + unless @election.active? + redirect_to quickaction_url(:ident => params[:ident], + :action => 'results') + end + # look to see that the voter has been created and has voted in # this election, and has confirmed their vote @voter = QuickVoter.find(:all, @@ -120,6 +136,7 @@ class QuickvoteController < ApplicationController end def confirm + # we need the election to verify that we have the right voter election = QuickVote.ident_to_quickvote(params[:ident]) @@ -127,7 +144,7 @@ class QuickvoteController < ApplicationController @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", session.session_id, election.id])[0] - + if not @voter # we have not seen this voter before. something is wrong, try # again @@ -139,13 +156,11 @@ class QuickvoteController < ApplicationController redirect_to quickvote_url( :ident => params[:ident] ) else + # record the ip address for posterity @voter.ipaddress = request.env["REMOTE_ADDR"] @voter.save - # save the time the vote was made for statistical use - @voter.vote.time = Time.now - # toggle the confirmation bit @voter.vote.confirm!