merged in changes from devel

[selectricity] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 537de40d7e3bdf68fa3816f217b9b9c997060db5..5b55d0bc97c1a23c6ef0653dbe04bb987062b009 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,4 +1,32 @@
 # 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
-end
\ No newline at end of file
+  include AuthenticatedSystem
+  helper :user
+  require_dependency "user"
+
+  before_filter :add_stylesheets
+   
+  def initialize
+    @stylesheets = []
+  end
+            
+  def add_stylesheets
+    file = "#{Dir.pwd}/public/stylesheets/#{controller_name}.css"
+    if File.exists? file
+      @stylesheets << controller_name
+    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