fixed up a series of things in prepration for the stress test on friday

[selectricity] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 5b55d0bc97c1a23c6ef0653dbe04bb987062b009..bdd11e8c425f98ce927c8d950a5fbdd7977b4c91 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,15 +1,30 @@
-# Filters added to this controller will be run for all controllers in the application.
-# Likewise, all the methods added will be available for all controllers.
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software. Please see the COPYING file for
+# details.
+
+# Filters added to this controller will be run for all controllers in
+# the application.  Likewise, all the methods added will be available
+# for all controllers.
 
 class ApplicationController < ActionController::Base
   include AuthenticatedSystem
   helper :user
   require_dependency "user"
 
+  include Sitealizer
   before_filter :add_stylesheets
+  #before_filter :use_sitealizer
    
   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
@@ -22,7 +37,7 @@ class ApplicationController < ActionController::Base
   #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