X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/5459df3cc567b3fd1bd11e365c928fd6a16dc49e..9b4770e85ce3add247c6462002ca910f6ba103da:/app/controllers/quickvote_controller.rb diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index fbf53d3..5bf89c7 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -2,21 +2,11 @@ # Copyright (C) 2007, 2008 Benjamin Mako Hill # Copyright (C) 2007 Massachusetts Institute of Technology # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public -# License along with this program. If not, see -# . +# 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" @@ -94,7 +84,7 @@ class QuickvoteController < ApplicationController end end flash.keep(:candidate_names) - render_partial 'candidate_list' + render :partial => 'candidate_list' end ############################################################# @@ -138,6 +128,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]) @@ -145,7 +136,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 @@ -162,9 +153,6 @@ class QuickvoteController < ApplicationController @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!