X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/d207da8dfc3f315f7758d1f5307c700ce4c25156..3c50454cc2031d8996c099ef3a0ff510ffdc299c:/app/controllers/election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 7e8273e..df0aa7c 100644
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -1,8 +1,8 @@
 class ElectionController < ApplicationController
   model :raw_voter_list, :voter, :vote, :candidate
-  layout 'vb'
+  layout 'main'
 
-  before_filter :login_required
+  #before_filter :login_required
 
   ## methods for displaying, creating,
   ## and manipulating election overview data
@@ -52,11 +52,12 @@ class ElectionController < ApplicationController
     @election = Election.find(params[:id])
     
     @election.voters.each do |voter|
-      email = VoterNotify.create_votestart(voter)
-      render(:text => "<pre>" + email.encoded + "</pre>")
+      email = VoterNotify.deliver_votestart(voter)
+      #render(:text => "<pre>" + email.encoded + "</pre>")
     end
 
-    #@election.activate!
+    @election.activate!
+    redirect_to :action => 'show', :id => @election.id
   end
 
   # methods fod display, adding, deleting, and manipulating candidate
@@ -195,15 +196,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
@@ -213,7 +214,10 @@ class ElectionController < ApplicationController
       @raw_voter_list.email = incoming_voters.email
     end
 
-    def email_voter
+    def email_voter(email=nil)
+      if email
+        
+      end
     end
 
 end