Allow custimizable graph sizes, to fit with newly modular results page. Also,

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 5b3acab79f21998d5897e90cc331b71745c37b8c..031c0755adb2a7f38b2d8c1b9c7b632778d0c99d 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -4,7 +4,7 @@ class QuickvoteController < ApplicationController
   require_dependency "quick_vote"
   require_dependency "vote"
   require_dependency "election"
-
+  
   #############################################################
   # the following methods pertain to creating quickvotes
   #############################################################
@@ -14,7 +14,7 @@ class QuickvoteController < ApplicationController
       @quickvote = QuickVote.new(params[:quickvote])
       # store the candidate grabbed through ajax and stored in flash
       @quickvote.candidatelist = flash[:candlist]
-      @quickvote.description=CGI.escapeHTML(@quickvote.description)
+      @quickvote.description=@quickvote.description
       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save
@@ -29,11 +29,12 @@ class QuickvoteController < ApplicationController
       # here has not been hitting this page and we can clear any
       # candlist in the flash
       flash.delete(:candlist) if flash.has_key?(:candlist)
+      @quickvote = QuickVote.new
     end
   end
 
   def add_candidate
-    candidate_name = CGI.escapeHTML(params[:ajax][:newcandidate])
+    candidate_name = params[:ajax][:newcandidate]
     unless candidate_name.strip.empty?
       if flash.has_key?(:candlist) and flash[:candlist].instance_of?(Array) 
         flash[:candlist] << candidate_name unless flash[:candlist].index(candidate_name)
@@ -161,8 +162,11 @@ class QuickvoteController < ApplicationController
       redirect_to :controller => 'site'
       return
     end
-    @election.results
+    @results = @election.results
     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
   end
+  
+  
 end
+