Refactor voter e-mail code into start election

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index ef51f7debed8167bbd6b5fe5b1300c185e52660c..eff920ff0419cdcb826e5b3d22817d13ffe07a5a 100644 (file)
--- 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
     @election = Election.find(params[:id])
     @election.voters.each do |voter|
       voter.vote = Vote.new

-      email = VoterNotify.deliver_votestart(voter)
-      #render(:text => "<pre>" + email.encoded + "</pre>")
+      email_voter voter

     end
 
     @election.activate!
     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!
         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
           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
       @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
 end