X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/94f498a0718776efa90193c918c6dd22f51329ac..0283f11b7fec9fcfb81093f9458e759ee7f91707:/app/controllers/quickvote_controller.rb diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index 1e5b142..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 @@ -160,26 +160,22 @@ class QuickvoteController < ApplicationController voter.destroy redirect_to quickvote_url( :ident => params[:ident] ) end - - def sort_candidates - @vote = Vote.find(params[:id]) - - @vote.rankings.each do |ranking| - ranking.rank = params['rankings-list'].index(ranking.candidate.id.to_s) + 1 - ranking.save - end - render :nothing => true - 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 @@ -189,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 @@ -203,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 @@ -212,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