Merge Justin

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

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 2847df91890d0ffd9212b1cee8c5281a9d1117f6..4783eb2d72ee79af31bd74f1e3de9112b02b7114 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -15,7 +15,7 @@ class QuickvoteController < ApplicationController
      
       # store the candidate grabbed through ajax and stored in flash
       @quickvote.candidatelist = flash[:candlist]
      
       # store the candidate grabbed through ajax and stored in flash
       @quickvote.candidatelist = flash[:candlist]

-
+      @quickvote.description=CGI.escapeHTML(@quickvote.description)

       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save
       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save


@@ -37,7 +37,7 @@ class QuickvoteController < ApplicationController
     candidate_name = CGI.escapeHTML(params[:ajax][:newcandidate])
     unless candidate_name.strip.empty?
       if flash.has_key?(:candlist) and flash[:candlist].instance_of?(Array) 
     candidate_name = CGI.escapeHTML(params[:ajax][:newcandidate])
     unless candidate_name.strip.empty?
       if flash.has_key?(:candlist) and flash[:candlist].instance_of?(Array) 

-        flash[:candlist] << candidate_name
+        flash[:candlist] << candidate_name unless flash[:candlist].index(candidate_name)

      else
        flash[:candlist] = [ candidate_name ]
       end
      else
        flash[:candlist] = [ candidate_name ]
       end