X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/8f23a174c70223831055e1498b50c3ba260858fe..215cf287e52da41605cb033da236a6b0aeee4f3a:/app/controllers/quickvote_controller.rb diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index a5c8065..eef3402 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -115,7 +115,7 @@ class QuickvoteController < ApplicationController @voter.reload end else - redirect_to :controller => 'site' + redirect_to :controller => 'front' end end @@ -161,15 +161,21 @@ class QuickvoteController < ApplicationController redirect_to quickvote_url( :ident => params[:ident] ) end - def mapvoters + def list_voters @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| + @election=QuickVote.ident_to_quickvote(params[:id]) + @election.voters.each do |voter| next unless voter.ipaddress - - location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress) + location=nil + if defined? Cache and location=Cache.get("GEO:#{voter.ipaddress}") + elsif defined? Cache + location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress) + Cache.set "GEO:#{voter.ipaddress}", location + else + location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress) + end next unless location.lng and location.lat unless center @@ -179,8 +185,7 @@ class QuickvoteController < ApplicationController marker = GMarker.new([location.lat,location.lng], :title => "Voter", - :info_window => (voter.ipaddress or "unknown") \ - + " " + voter.vote.votestring) + :info_window => (voter.ipaddress or "unknown")) @map.overlay_init(marker) end end @@ -193,7 +198,7 @@ class QuickvoteController < ApplicationController def results unless @election = QuickVote.ident_to_quickvote(params[:ident]) flash[:notice] = "Cannot find quickvote #{params[:ident]}." - redirect_to :controller => 'site' + redirect_to :controller => 'front' return end if @election.viewable == 0 && @election.active == 1 @@ -202,6 +207,7 @@ class QuickvoteController < ApplicationController @results = @election.results @candidates = {} @election.candidates.each {|c| @candidates[c.id] = c} + @names = @election.names_by_id @sidebar_content = render_to_string :partial => 'results_sidebar' end