X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/c992f015ed80cab29bd0f4b6cdd0ddbc1d00d304..a7c9f5ae54334ea4c0c1308b931b143cf1449f48:/app/controllers/quickvote_controller.rb?ds=sidebyside diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index 83a6cc5..e327ed6 100644 --- 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] - + @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 @@ -34,11 +34,13 @@ class QuickvoteController < ApplicationController end def add_candidate - candidate_name = params[:ajax][:newcandidate] - if flash.has_key?(:candlist) and flash[:candlist].instance_of?(Array) - flash[:candlist] << candidate_name - else - flash[:candlist] = [ candidate_name ] + 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 unless flash[:candlist].index(candidate_name) + else + flash[:candlist] = [ candidate_name ] + end end flash.keep(:candlist) render_partial 'candidate_list' @@ -135,7 +137,22 @@ class QuickvoteController < ApplicationController render :nothing => true end - + def mapvoters + @map = GMap.new("map_div_id") + @map.control_init(:large_map => true, :map_type => true) + center=nil + QuickVote.ident_to_quickvote(params[:id]).voters.each do |voter| + next unless voter.ipaddress + location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress) + next unless location.lng and location.lat + unless center + center=[location.lat,location.lng] + @map.center_zoom_init(center,4) + end + marker = GMarker.new([location.lat,location.lng], :title => "Voter", :info_window => (voter.ipaddress or "unknown")+" "+voter.vote.votestring) + @map.overlay_init(marker) + end + end ############################################################### # the following method pertains to displaying the results of a # quickvote