Updated quickvote creation to fix expanding and unexpanding.

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 6886ca40e32f844469f50666d1c63ca130ed8874..ea7711fa2fc5981b74da5f7e66e450838ee4df78 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -25,10 +25,6 @@ class QuickvoteController < ApplicationController
 
     show_advanced ||= false
 
 
     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
     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
         @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 
 
         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
       # 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
     end
 
   end