From: John Dong Date: Thu, 30 Aug 2007 16:39:53 +0000 (-0400) Subject: Merge from jdong X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/7963fe06622ddbda89c0b6d6431339f26b9d6ecf?hp=a92ebf4fa0498e973d22fb12d63f4e2d5072c5e5 Merge from jdong --- diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index ef51f7d..eff920f 100644 --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -62,8 +62,7 @@ class ElectionController < ApplicationController @election = Election.find(params[:id]) @election.voters.each do |voter| voter.vote = Vote.new - email = VoterNotify.deliver_votestart(voter) - #render(:text => "
" + email.encoded + "
") + email_voter voter end @election.activate! @@ -201,13 +200,6 @@ class ElectionController < ApplicationController incoming_voters.each do |new_voter| new_voter.email.strip! # There's a trailing \r on all but the last in # the list! - if incoming_voters.email == 0 - new_voter.contacted = 1 - elsif incoming_voters.email == 1 - new_voter.contacted = 1 - else - new_voter.contacted = 0 - end if new_voter.valid? # the new voter should be in good shape. save add to the election @election.voters << new_voter @@ -222,4 +214,13 @@ class ElectionController < ApplicationController @raw_voter_list = RawVoterList.new @raw_voter_list.email = incoming_voters.email end + + def email_voter(voter=nil) + if voter + VoterNotify.deliver_votestart(voter) + voter.contacted=1 + voter.save + end + end + end