Fix more DeprecationWarnings

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 2847df91890d0ffd9212b1cee8c5281a9d1117f6..41d0dc3616050ef909e39ebbcaa2eef7363da12f 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -1,9 +1,9 @@
 class QuickvoteController < ApplicationController
   layout 'main'
 class QuickvoteController < ApplicationController
   layout 'main'

-  model :quick_voter
-  model :quick_vote
-  model :vote
-  model :election
+  require_dependency "quick_voter"
+  require_dependency "quick_vote"
+  require_dependency "vote"
+  require_dependency "election"

 
   #############################################################
   # the following methods pertain to creating quickvotes
 
   #############################################################
   # the following methods pertain to creating quickvotes


@@ -15,7 +15,7 @@ class QuickvoteController < ApplicationController
      
       # store the candidate grabbed through ajax and stored in flash
       @quickvote.candidatelist = flash[:candlist]
      
       # 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
       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save


@@ -37,7 +37,7 @@ class QuickvoteController < ApplicationController
     candidate_name = CGI.escapeHTML(params[:ajax][:newcandidate])
     unless candidate_name.strip.empty?
       if flash.has_key?(:candlist) and flash[:candlist].instance_of?(Array) 
     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
+        flash[:candlist] << candidate_name unless flash[:candlist].index(candidate_name)

      else
        flash[:candlist] = [ candidate_name ]
       end
      else
        flash[:candlist] = [ candidate_name ]
       end


@@ -59,7 +59,7 @@ class QuickvoteController < ApplicationController
 
       # look to see that the voter has been created and has voted in
       # this election, and has confirmed their vote
 
       # look to see that the voter has been created and has voted in
       # this election, and has confirmed their vote

-      @voter = QuickVoter.find_all(["session_id = ? and election_id = ?",
+      @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?",

                                   session.session_id, @election.id])[0]
 
       # if the voter has not voted we destroy them
                                   session.session_id, @election.id])[0]
 
       # if the voter has not voted we destroy them


@@ -92,7 +92,7 @@ class QuickvoteController < ApplicationController
     election = QuickVote.ident_to_quickvote(params[:ident])
 
     # find out who the voter is for this election
     election = QuickVote.ident_to_quickvote(params[:ident])
 
     # find out who the voter is for this election

-    @voter = QuickVoter.find_all(["session_id = ? and election_id = ?", 
+    @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", 

                                  session.session_id, election.id])[0]
   
     if not @voter
                                  session.session_id, election.id])[0]
   
     if not @voter


@@ -122,7 +122,7 @@ class QuickvoteController < ApplicationController
   end
  
   def change
   end
  
   def change

-    voter = QuickVoter.find_all(["session_id = ?", session.session_id])[0]
+    voter = QuickVoter.find(:all, :conditions => ["session_id = ?", session.session_id])[0]

     voter.destroy
     redirect_to quickvote_url( :ident => params[:ident] )
   end
     voter.destroy
     redirect_to quickvote_url( :ident => params[:ident] )
   end


@@ -137,7 +137,22 @@ class QuickvoteController < ApplicationController
     render :nothing => true
   end
                
     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
   ###############################################################
   # the following method pertains to displaying the results of a
   # quickvote