the embeddable widgets now grow or shrink to accomodate more candidates, there are...

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 94c203d104c902de9dd673a3713ad0c2e76a9fa7..571b93628e7e916f2dd4e2228e91c02729c5344d 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -76,13 +76,18 @@ class ElectionController < ApplicationController
                                         :locals => { :page => 'review' }
 
     @election = Election.find(params[:id])
                                         :locals => { :page => 'review' }
 
     @election = Election.find(params[:id])

+    if @election.type == QuickVote
+      redirect_to(:controller => 'quickvote', :action => 'index', :ident => @election.id)
+    end
+      

   end
 
   def start_election
     @election = Election.find(params[:id])
   end
 
   def start_election
     @election = Election.find(params[:id])

+    

     @election.voters.each do |voter|
       voter.vote = Vote.new
     @election.voters.each do |voter|
       voter.vote = Vote.new

-      email_voter voter
+      email_voter voter unless voter.email.nil?

     end
 
     @election.activate!
     end
 
     @election.activate!


@@ -168,7 +173,7 @@ class ElectionController < ApplicationController
   def results
     @election = Election.find( params[:id] )
     votes = []
   def results
     @election = Election.find( params[:id] )
     votes = []

-
+    

     @election.voters.each do |voter|
       if voter.vote and voter.vote.confirmed?
         votes << voter.vote.rankings.sort.collect {|vote| vote.candidate_id}
     @election.voters.each do |voter|
       if voter.vote and voter.vote.confirmed?
         votes << voter.vote.rankings.sort.collect {|vote| vote.candidate_id}


@@ -181,6 +186,7 @@ class ElectionController < ApplicationController
     
     @candidates_by_id = {}
     @election.candidates.each {|cand| @candidates_by_id[cand.id] = cand}
     
     @candidates_by_id = {}
     @election.candidates.each {|cand| @candidates_by_id[cand.id] = cand}

+    

   end
   
   def detailed_results
   end
   
   def detailed_results


@@ -189,7 +195,8 @@ class ElectionController < ApplicationController
 
     @voter_list = []
     @vote_list = []
 
     @voter_list = []
     @vote_list = []

-    @election.voters. each do |voter|
+    
+    @election.voters.each do |voter|

       if voter.vote and voter.vote.confirmed?
         @voter_list << voter.email
              @vote_list << voter.vote
       if voter.vote and voter.vote.confirmed?
         @voter_list << voter.email
              @vote_list << voter.vote