Big commit includes:
[selectricity] / app / controllers / quickvote_controller.rb
index e327ed6a17a55ed967e8f24120299554bc640794..e675638f2af35b619c967560fb32eae5fc3613fd 100644 (file)
@@ -1,10 +1,10 @@
 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
   #############################################################
@@ -12,37 +12,40 @@ class QuickvoteController < ApplicationController
   def create
     if params[:quickvote] 
       @quickvote = QuickVote.new(params[:quickvote])
-     
       # store the candidate grabbed through ajax and stored in flash
-      @quickvote.candidatelist = flash[:candlist]
-      @quickvote.description=CGI.escapeHTML(@quickvote.description)
+      @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
       if @quickvote.save
         @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
 
   def add_candidate
-    candidate_name = CGI.escapeHTML(params[:ajax][:newcandidate])
+    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
  
@@ -52,15 +55,14 @@ class QuickvoteController < ApplicationController
 
   def index
     @election = QuickVote.ident_to_quickvote(params[:ident])
-    
     # if the person has specified an election, we show them the voting
     # page. otherwise, we redirect back to main the page
     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(["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?
@@ -75,8 +77,8 @@ class QuickvoteController < ApplicationController
         @voter = QuickVoter.new
         @voter.election = @election
         @voter.session_id = session.session_id
-        
-             # create new vote and make it the defaulted sorted list
+             
+        # create new vote and make it the defaulted sorted list
         @voter.vote = Vote.new
              @voter.save
              @voter.vote.set_defaults!
@@ -92,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(["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
@@ -122,7 +125,8 @@ class QuickvoteController < ApplicationController
   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
@@ -140,28 +144,43 @@ 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
   ###############################################################
 
   def results
-    @election = QuickVote.ident_to_quickvote(params[:ident])
-    @election.results
+    unless @election = QuickVote.ident_to_quickvote(params[:ident])
+      flash[:notice] = "Cannot find quickvote #{params[:ident]}."
+      redirect_to :controller => 'site'
+      return
+    end
+    @results = @election.results
     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
   end
+  
+  
 end
+

Benjamin Mako Hill || Want to submit a patch?