Merge from jdong

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 7e8273efcf5048ed4874eef2b90edd41a1e50364..df0aa7c53631ab968b7d2f6bf963172645ae4f3f 100644 (file)
--- 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
 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
 
   ## 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


@@ -195,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


@@ -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