Merge from my devel branch

[selectricity-live] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index a418c49337682a523fc418d9a450395ddb0c1289..df0aa7c53631ab968b7d2f6bf963172645ae4f3f 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -1,6 +1,6 @@
 class ElectionController < ApplicationController
   model :raw_voter_list, :voter, :vote, :candidate
 class ElectionController < ApplicationController
   model :raw_voter_list, :voter, :vote, :candidate

-  layout 'hc'
+  layout 'main'

 
   #before_filter :login_required
 
 
   #before_filter :login_required
 


@@ -196,15 +196,15 @@ class ElectionController < ApplicationController
 
           if incoming_voters.email == 0
             new_voter.contacted = 1
 
           if incoming_voters.email == 0
             new_voter.contacted = 1

-         elsif incoming_voters.email == 1
-           email_voter( new_voter )
-           new_voter.contacted = 1
-         else
-           new_voter.contacted = 0
-         end
+               elsif incoming_voters.email == 1
+                 email_voter( new_voter )
+            new_voter.contacted = 1
+               else
+                 new_voter.contacted = 0
+          end

        
           # the new voter should be in good shape. save add to the election
        
           # the new voter should be in good shape. save add to the election

-         new_voter.save
+               new_voter.save

           @election.voters << new_voter
         end
       end
           @election.voters << new_voter
         end
       end