X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/bb6aa392b953e018389843b02f044afd45d8afb9..09c67d9323c7d379d4c6de5dc0457b6de16cff14:/app/controllers/quickvote_controller.rb diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index d842f63..0b745af 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -63,7 +63,7 @@ class QuickvoteController < ApplicationController # if the voter has not voted we destroy them if @voter and not @voter.voted? @voter.destroy - @voter = nil + @voter = nil end # if the voter does not exist or has has been destroyed, lets @@ -73,12 +73,12 @@ class QuickvoteController < ApplicationController @voter = QuickVoter.new @voter.election = QuickVote.find_all( [ "name = ?", params[:votename] ] )[0] @voter.session_id = session.session_id - - # create new vote and make it the defaulted sorted list + + # create new vote and make it the defaulted sorted list @voter.vote = Vote.new - @voter.save - @voter.vote.set_defaults! - @voter.reload + @voter.save + @voter.vote.set_defaults! + @voter.reload end else redirect_to :controller => 'site' @@ -91,14 +91,14 @@ class QuickvoteController < ApplicationController # find out who the voter is for this election @voter = QuickVoter.find_all(["session_id = ? and election_id = ?", - session.session_id, election.id])[0] - + session.session_id, election.id])[0] + if not @voter # we have not seen this voter before. something is wrong, try # again redirect_to quickvote_url( :votename => params[:votename] ) - elsif @voter.voted? + elsif @voter.voted? # this person has already voted, we try again flash[:notice] = "You have already voted!" redirect_to quickvote_url( :votename => params[:votename] ) @@ -108,8 +108,7 @@ class QuickvoteController < ApplicationController @voter.ipaddress = request.env["REMOTE_ADDR"] @voter.save - # save the time the vote was made for statistical use, it doesn't - #work here unless I use a method that will save it to the db + # save the time the vote was made for statistical use @voter.vote.time = Time.now # toggle the confirmation bit @@ -143,7 +142,7 @@ class QuickvoteController < ApplicationController ############################################################### def results - @election = QuickVote.find_all( ["name = ?", params[:votename]] )[0] + @election = QuickVote.find_all(["name = ?", params[:votename]] )[0] # initalize the tallies to empty arrays preference_tally = Array.new