fixed some typos caught in the first usage

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

diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index fb1bec7a0f69f84b1063b6e936722763d022b8f3..461be29d252d480831413544e449e66bb2d024da 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -5,12 +5,30 @@ class VoterController < ApplicationController
   require_dependency "election"
 
   def index
   require_dependency "election"
 
   def index

-    password = params[:id]
-    password = params[:vote][:password] if params[:vote]
-    if @voter = FullVoter.find(:all, :conditions => [ "password = ?", password ] )[0]
+    if params[:urlpassword]
+      password = params[:urlpassword]
+    else
+      password = nil
+    end
+
+    if @voter = FullVoter.find(:all, :conditions =>
+                                       [ "password = ?", password ] )[0]

       @voter.vote = Vote.new if @voter.vote.nil?
       @voter.vote.set_defaults! if @voter.vote.rankings.empty?
       @voter.vote = Vote.new if @voter.vote.nil?
       @voter.vote.set_defaults! if @voter.vote.rankings.empty?

+
+      @election = @voter.election
+      @sidebar_content = render_to_string(:partial => 'sortable_vote')

       render :action => 'full_vote'
       render :action => 'full_vote'

+    elsif params[:urlpassword] 
+      redirect_to :action => 'index'
+    end
+  end
+
+  def login
+    if params[:vote] and params[:vote][:password]
+      redirect_to votepassword_url( :action => 'index', :urlpassword => params[:vote][:password])
+    else
+      redirect_to :action => 'index'

     end
   end
   
     end
   end
   


@@ -33,6 +51,18 @@ class VoterController < ApplicationController
     end
   end
   
     end
   end
   

+  def reminder
+    if params[:email]
+      voter_array= FullVoter.find(:all, :conditions => ["email = ?", params[:email]])
+      voter_array.delete_if {|voter| voter.election.active == 0}
+      unless voter_array.empty?
+        VoterNotify.deliver_reminder(voter_array)
+      end
+      render :action => 'reminder_sent'
+    end
+  end
+  
+  

   private
   def authenticate
     password = params[:id]
   private
   def authenticate
     password = params[:id]