X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/c5d48f6ea92e43f07182d20ebe693692b4330437..8964e46880760a85a7c86a239f032c841a96410d:/app/controllers/quickvote_controller.rb diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index 6886ca4..1e5b142 100644 --- 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 @@ -211,6 +212,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