Changed properties to remove unecessary exectables.

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

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 7145d3d20c3ce4198fcb9d5d88bbc1747967e0fe..a418c49337682a523fc418d9a450395ddb0c1289 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -2,7 +2,7 @@ class ElectionController < ApplicationController
   model :raw_voter_list, :voter, :vote, :candidate
   layout 'hc'
 
   model :raw_voter_list, :voter, :vote, :candidate
   layout 'hc'
 

-  before_filter :login_required
+  #before_filter :login_required

 
   ## methods for displaying, creating,
   ## and manipulating election overview data
 
   ## 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|
     @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
 
     end
 

-    #@election.activate!
+    @election.activate!
+    redirect_to :action => 'show', :id => @election.id

   end
 
   # methods fod display, adding, deleting, and manipulating candidate
   end
 
   # methods fod display, adding, deleting, and manipulating candidate


@@ -213,7 +214,10 @@ class ElectionController < ApplicationController
       @raw_voter_list.email = incoming_voters.email
     end
 
       @raw_voter_list.email = incoming_voters.email
     end
 

-    def email_voter
+    def email_voter(email=nil)
+      if email
+        
+      end

     end
 
 end
     end
 
 end