X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/823d530ba46c1fb3518c4deef0081738503837eb..905cf65f6b3e8acc894c268c3bf729e7b0c76292:/app/controllers/quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 031c075..e675638 100644
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -13,7 +13,7 @@ class QuickvoteController < ApplicationController
     if params[:quickvote] 
       @quickvote = QuickVote.new(params[:quickvote])
       # store the candidate grabbed through ajax and stored in flash
-      @quickvote.candidatelist = flash[:candlist]
+      @quickvote.candidate_names = flash[:candidate_names]
       @quickvote.description=@quickvote.description
       # try to save, if it fails, show the page again (the flash should
       # still be intact
@@ -21,14 +21,14 @@ class QuickvoteController < ApplicationController
         @quickvote = @quickvote.reload
         render :action => 'success'
       else
-        flash.keep(:candlist)
+        flash.keep(:candidate_names)
       end 
 
     else
       # if we don't have a quickvote param, it means that the person
       # here has not been hitting this page and we can clear any
-      # candlist in the flash
-      flash.delete(:candlist) if flash.has_key?(:candlist)
+      # candidate_names list in the flash
+      flash.delete(:candidate_names) if flash.has_key?(:candidate_names)
       @quickvote = QuickVote.new
     end
   end
@@ -36,13 +36,16 @@ class QuickvoteController < ApplicationController
   def add_candidate
     candidate_name = params[:ajax][:newcandidate]
     unless candidate_name.strip.empty?
-      if flash.has_key?(:candlist) and flash[:candlist].instance_of?(Array) 
-        flash[:candlist] << candidate_name unless flash[:candlist].index(candidate_name)
+      if flash.has_key?(:candidate_names) \
+        and flash[:candidate_names].instance_of?(Array) 
+        unless flash[:candidate_names].index(candidate_name)
+          flash[:candidate_names] << candidate_name
+        end
      else
-       flash[:candlist] = [ candidate_name ]
+       flash[:candidate_names] = [ candidate_name ]
       end
     end
-    flash.keep(:candlist)
+    flash.keep(:candidate_names)
     render_partial 'candidate_list'
   end
  
@@ -57,8 +60,9 @@ class QuickvoteController < ApplicationController
     if @election
       # look to see that the voter has been created and has voted in
       # this election, and has confirmed their vote
-      @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?",
-                                  session.session_id, @election.id])[0]
+      @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
       if @voter and not @voter.voted?
@@ -90,8 +94,9 @@ class QuickvoteController < ApplicationController
     election = QuickVote.ident_to_quickvote(params[:ident])
 
     # find out who the voter is for this election
-    @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", 
-                                 session.session_id, election.id])[0]
+    @voter = QuickVoter.find(:all,
+      :conditions => ["session_id = ? and election_id = ?", 
+                      session.session_id, election.id])[0]
   
     if not @voter
       # we have not seen this  voter before. something is wrong, try
@@ -120,7 +125,8 @@ class QuickvoteController < ApplicationController
   end
  
   def change
-    voter = QuickVoter.find(:all, :conditions => ["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
@@ -138,19 +144,27 @@ class QuickvoteController < ApplicationController
   def mapvoters
     @map = GMap.new("map_div_id") 
     @map.control_init(:large_map => true, :map_type => true) 
-    center=nil
+    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)
+        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)
+
+      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