X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/8964e46880760a85a7c86a239f032c841a96410d..bf220bde847fd30e9bf0d00dd7c9aff31265c810:/app/controllers/quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 1e5b142..d8d3d59 100644
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -160,25 +160,14 @@ 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)
       next unless location.lng and location.lat
 
@@ -212,6 +201,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