Added the Gruff library to the lib/ directory of the the rails folder, and the

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

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 6886ca40e32f844469f50666d1c63ca130ed8874..da2903d1a01fa3fecf1f5d0a665c49801f5ff538 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -25,10 +25,6 @@ class QuickvoteController < ApplicationController
 
     show_advanced ||= false
 
-    # render the sidebar
-    @sidebar_content = render_to_string(:partial => 'create_sidebar',
-      :locals => {:show_advanced => show_advanced})
-
     if params[:quickvote]
 
       # store the candidate grabbed through ajax and stored in flash
@@ -49,6 +45,9 @@ class QuickvoteController < ApplicationController
         @sidebar_content = ''
         render :action => 'success'
       else
+        # render the sidebar
+        @sidebar_content = render_to_string(:partial => 'create_sidebar',
+          :locals => {:show_advanced => show_advanced})
         flash.keep(:candidate_names)
       end 
 
@@ -58,6 +57,8 @@ class QuickvoteController < ApplicationController
       # candidate_names list in the flash
       flash.delete(:candidate_names) if flash.has_key?(:candidate_names)
       @quickvote = QuickVote.new
+      @sidebar_content = render_to_string(:partial => 'create_sidebar',
+        :locals => {:show_advanced => show_advanced})
     end
 
   end
@@ -159,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") 
@@ -211,6 +202,8 @@ class QuickvoteController < ApplicationController
     @results = @election.results
     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
+    @names = @election.names_by_id
+    @sidebar_content = render_to_string :partial => 'results_sidebar'
   end
   
   def my_quickvotes