X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/ad088c1324d08a65f6f5336bedf7a88a8a8950e7..b1b6fe468411fa18118846fef18c993167fdb570:/app/controllers/voter_controller.rb diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb index 45b9a1a..afc0103 100644 --- a/app/controllers/voter_controller.rb +++ b/app/controllers/voter_controller.rb @@ -27,11 +27,12 @@ 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 @@ -53,7 +54,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 @@ -152,6 +153,7 @@ class VoterController < ApplicationController end def results + debugger if authenticate and (@voter.election.early_results? \ or @voter.election.enddate < Time.now) @@ -193,12 +195,22 @@ class VoterController < ApplicationController password = params[:id] if password == "open" election = Election.find(params[:format]) + + # double check to make sure the election is not authenticated unless election.authenticated? - @voter = Voter.find(:all, + @voter = OpenVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", session.session_id, election.id])[0] + + # if the election is over, proceed + if (not @voter) and (election.enddate < Time.now) + @voter = OpenVoter.new + @voter.election = election + end + @password = "open." + election.id.to_s end + else @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]