Merge jdong

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

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index c2ed0559659e4995f7ccbb53aecd74aef41b81eb..1e5b14226b0049a83c3bab7477a75de2ee57bbd5 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -12,17 +12,42 @@ 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
+
+    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
+        # render the sidebar
+        @sidebar_content = render_to_string(:partial => 'create_sidebar',
+          :locals => {:show_advanced => show_advanced})
         flash.keep(:candidate_names)
       end 
 
@@ -32,7 +57,10 @@ 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
 
   def add_candidate
@@ -178,9 +206,13 @@ class QuickvoteController < ApplicationController
       redirect_to :controller => 'site'
       return
     end
+    if @election.viewable == 0 && @election.active == 1
+      render :action => 'not_viewable' and return
+    end
     @results = @election.results
     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
+    @sidebar_content = render_to_string :partial => 'results_sidebar'
   end
   
   def my_quickvotes