X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/91c9d10ebdbdd37b03fd287a9923759f85561d20..9b4770e85ce3add247c6462002ca910f6ba103da:/app/controllers/voter_controller.rb diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb index 9e88e9e..c063469 100644 --- a/app/controllers/voter_controller.rb +++ b/app/controllers/voter_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 VoterController < ApplicationController + helper :sparklines layout 'main' require_dependency "voter" require_dependency "vote" @@ -26,11 +16,11 @@ class VoterController < ApplicationController if params[:election_id] @election = Election.find(params[:election_id]) unless @election.authenticated? - @voter = Voter.find(:all, + @voter = OpenVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", session.session_id, @election.id])[0] - @voter = Voter.new unless @voter + @voter = OpenVoter.new unless @voter @voter.election = @election @voter.session_id = session.session_id @@ -52,7 +42,7 @@ class VoterController < ApplicationController @voter.vote = Vote.new @voter.save end - + @voter.vote.set_defaults! if @voter.vote.rankings.empty? # if the election is now finished @@ -106,8 +96,8 @@ class VoterController < ApplicationController def details if authenticate @election = @voter.election - @votes = @election.votes.select {|v| v.confirmed? }.randomize - @voters = @votes.collect {|v| v.voter}.randomize + @votes = @election.votes.select {|v| v.confirmed? }.shuffle + @voters = @votes.collect {|v| v.voter}.shuffle render :action => 'details' else redirect_to :action => 'index' @@ -193,7 +183,7 @@ class VoterController < ApplicationController if password == "open" election = Election.find(params[:format]) unless election.authenticated? - @voter = Voter.find(:all, + @voter = OpenVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", session.session_id, election.id])[0] @password = "open." + election.id.to_s