merged changes back from live

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

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index b9c790f40f872fa99048f10aec38cc76abc348a1..eef3402c109ac813237ce739748345c9d30b02f8 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -115,7 +115,7 @@ class QuickvoteController < ApplicationController
              @voter.reload
       end
     else
              @voter.reload
       end
     else

-      redirect_to :controller => 'site'
+      redirect_to :controller => 'front'

     end
   end
 
     end
   end
 


@@ -169,8 +169,8 @@ class QuickvoteController < ApplicationController
     @election.voters.each do |voter|
       next unless voter.ipaddress
       location=nil
     @election.voters.each do |voter|
       next unless voter.ipaddress
       location=nil

-      if Cache and location=Cache.get("GEO:#{voter.ipaddress}")
-      elsif Cache
+      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)
         Cache.set "GEO:#{voter.ipaddress}", location
       else


@@ -185,8 +185,7 @@ class QuickvoteController < ApplicationController
 
       marker = GMarker.new([location.lat,location.lng],
                            :title => "Voter",
 
       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
       @map.overlay_init(marker)
     end
   end


@@ -199,7 +198,7 @@ class QuickvoteController < ApplicationController
   def results
     unless @election = QuickVote.ident_to_quickvote(params[:ident])
       flash[:notice] = "Cannot find quickvote #{params[:ident]}."
   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
       return
     end
     if @election.viewable == 0 && @election.active == 1