fixed a large number of bugs in the software (see wiki) over a days work

[selectricity-live] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index a71d7b4626c7ae26ebb8bd18a112908da3c2e680..7be877afa8cbf011e4da5385feae4fe0a6d35f05 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -1,5 +1,13 @@
-# 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
 
 class ApplicationController < ActionController::Base
   include AuthenticatedSystem


@@ -28,8 +36,9 @@ class ApplicationController < ActionController::Base
 
   #both election_controller and quickvote_controller need this method
   def sort_candidates
 
   #both election_controller and quickvote_controller need this method
   def sort_candidates

+    

     @vote = Vote.find(params[:id])
     @vote = Vote.find(params[:id])

-
+    

     @vote.rankings.each do |ranking|
       ranking.rank = params['rankings-list'].index(ranking.candidate.id.to_s) + 1
       ranking.save
     @vote.rankings.each do |ranking|
       ranking.rank = params['rankings-list'].index(ranking.candidate.id.to_s) + 1
       ranking.save