fixed the string modification function and added support for a titlecase method

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index a0549d40d510fabb9abd71e223a528a29879be48..7145d3d20c3ce4198fcb9d5d88bbc1747967e0fe 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
-  layout 'vb'
+  layout 'hc'
 
   before_filter :login_required
 
@@ -48,9 +48,15 @@ class ElectionController < ApplicationController
     end
   end
 
-  def destroy
-    election = Election.find(params[:id]).destroy
-    redirect_to :action => 'list'
+  def start_election
+    @election = Election.find(params[:id])
+    
+    @election.voters.each do |voter|
+      email = VoterNotify.create_votestart(voter)
+      render(:text => "<pre>" + email.encoded + "</pre>")
+    end
+
+    #@election.activate!
   end
 
   # methods fod display, adding, deleting, and manipulating candidate
@@ -97,12 +103,12 @@ class ElectionController < ApplicationController
 
   def update_candidate
     @candidate = Candidate.find(params[:id])
+    @election = @candidate.election
 
     if @candidate.update_attributes(params[:candidate])
-      flash[:notice] = 'Candidate information was successfully updated.'
-      redirect_to :action => 'edit_candidates', :id => @candidate.election
+      redirect_to :action => 'edit_candidates', :id => @candidate.election.id
     else
-      render :action => 'edit_candidates'
+      render :action => 'edit_candidate'
     end
   end