Fix full voter addition bug where the regex flunks the trailing \r on middle items...

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index fa1313cb68cecdd0f06d8c5c8ff14f9004f8ab9c..05a66fff5fef68c273ca0a9c024283a26a0f0a76 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -145,7 +145,6 @@ class ElectionController < ApplicationController
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )
     end
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )
     end

-

     @raw_voter_list = RawVoterList.new
   end
   
     @raw_voter_list = RawVoterList.new
   end
   


@@ -200,7 +199,8 @@ class ElectionController < ApplicationController
 
       unless incoming_voters.entries.empty?
         incoming_voters.each do |new_voter|
 
       unless incoming_voters.entries.empty?
         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
           if incoming_voters.email == 0
             new_voter.contacted = 1
                elsif incoming_voters.email == 1


@@ -209,11 +209,14 @@ class ElectionController < ApplicationController
                else
                  new_voter.contacted = 0
           end
                else
                  new_voter.contacted = 0
           end

-       
-          # the new voter should be in good shape. save add to the election
-          @election.voters << new_voter
-               new_voter.save
+          if new_voter.valid?
+            # the new voter should be in good shape. save add to the election
+            @election.voters << new_voter
+                 new_voter.save
+          end
+          # TODO: Can we do some kind of AJAX error message for the voter being invalid?

         end
         end

+        @election.save

       end
  
       # reset the next time to have a the same default value for emailing
       end
  
       # reset the next time to have a the same default value for emailing