Merge jdong

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index ea7711fa2fc5981b74da5f7e66e450838ee4df78..a5c8065035ef1147d1428831cc09dcd7a067c907 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -160,16 +160,6 @@ class QuickvoteController < ApplicationController
     voter.destroy
     redirect_to quickvote_url( :ident => params[:ident] )
   end
-
-  def sort_candidates
-    @vote = Vote.find(params[:id])
-
-    @vote.rankings.each do |ranking|
-      ranking.rank = params['rankings-list'].index(ranking.candidate.id.to_s) + 1
-      ranking.save
-    end
-    render :nothing => true
-  end
                
   def mapvoters
     @map = GMap.new("map_div_id") 
@@ -212,6 +202,7 @@ class QuickvoteController < ApplicationController
     @results = @election.results
     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
+    @sidebar_content = render_to_string :partial => 'results_sidebar'
   end
   
   def my_quickvotes