X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/9347f6bd316ab609f4b780658855e52e7937e5a6..c5d48f6ea92e43f07182d20ebe693692b4330437:/app/controllers/quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index cd63c2e..6886ca4 100644
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -12,17 +12,41 @@ class QuickvoteController < ApplicationController
   def create
     if params[:quickvote]
       @quickvote = QuickVote.new(params[:quickvote])
+
+      # check to see if any of the advanced options have been changed
+      new_qv = QuickVote.new
+      if @quickvote.election_method != new_qv.election_method \
+        or @quickvote.enddate.day != new_qv.enddate.day \
+        or @quickvote.viewable != new_qv.viewable \
+        or @quickvote.notices != new_qv.notices
+        show_advanced = true
+      end
+    end
+
+    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
       @quickvote.candidate_names = flash[:candidate_names]
       @quickvote.description=@quickvote.description
+
       #record who created the quickvote so that person can monitor it easily
       @quickvote.quickuser = session.session_id
+
       #Give registered users additional QuickVote functionality 
       @quickvote.user_id = session[:user][:id] if session[:user]
+
       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save
         @quickvote = @quickvote.reload
+        # blank sidebar and show the success page
+        @sidebar_content = ''
         render :action => 'success'
       else
         flash.keep(:candidate_names)
@@ -35,6 +59,7 @@ class QuickvoteController < ApplicationController
       flash.delete(:candidate_names) if flash.has_key?(:candidate_names)
       @quickvote = QuickVote.new
     end
+
   end
 
   def add_candidate