merged in link to blog

[selectricity] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index aeb2204f38ef75015b229032463114d7975330be..a71d7b4626c7ae26ebb8bd18a112908da3c2e680 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -5,10 +5,18 @@ class ApplicationController < ActionController::Base
   include AuthenticatedSystem
   helper :user
   require_dependency "user"
   include AuthenticatedSystem
   helper :user
   require_dependency "user"

+
+  include Sitealizer

   before_filter :add_stylesheets
   before_filter :add_stylesheets

+  #before_filter :use_sitealizer

    
   def initialize
     @stylesheets = []
    
   def initialize
     @stylesheets = []

+
+        
+    # this is defined is a sketchy way in the sitealizer mixin
+    # initalize. since i'm overloading that, i'm calling it here
+    $visits = [] unless $visits

   end
             
   def add_stylesheets
   end
             
   def add_stylesheets


@@ -18,4 +26,14 @@ class ApplicationController < ActionController::Base
     end
   end
 
     end
   end
 

+  #both election_controller and quickvote_controller need this method
+  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

 end
 end