X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/5f51982916827b84d73bfa8f3a98a9ee1d48d3ce..95691fd5d48bc5c43ae128de16841906eb5ca106:/app/controllers/election_controller.rb?ds=inline

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index a418c49..d333294 100644
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -1,6 +1,9 @@
 class ElectionController < ApplicationController
-  model :raw_voter_list, :voter, :vote, :candidate
-  layout 'hc'
+  require_dependency "raw_voter_list"
+  require_dependency "voter"
+  require_dependency "vote"
+  require_dependency "candidate"
+  layout 'main'
 
   #before_filter :login_required
 
@@ -196,15 +199,15 @@ class ElectionController < ApplicationController
 
           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
-	  new_voter.save
+	        new_voter.save
           @election.voters << new_voter
         end
       end