updated the git ignore file

[selectricity-live] / app / models / vote.rb

diff --git a/app/models/vote.rb b/app/models/vote.rb
index bef35020a45b1a7d37ca25fdd86dec73259f8ab5..cc423110264b43edbefd6ff00e1ec2e9a2230ad6 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -2,19 +2,8 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #

-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public
-# License along with this program.  If not, see
-# <http://www.gnu.org/licenses/>.
+# This program is free software. Please see the COPYING file for
+# details.

 
 class Vote < ActiveRecord::Base
   # relationships to other classes
 
 class Vote < ActiveRecord::Base
   # relationships to other classes


@@ -39,7 +28,7 @@ class Vote < ActiveRecord::Base
       if rankings.empty?
         @votes = Array.new
       else
       if rankings.empty?
         @votes = Array.new
       else

-        @votes = rankings.sort.collect { |ranking| ranking.candidate.id }
+        @votes = self.rankings.sort.collect { |ranking| ranking.candidate.id }

       end
     end
 
       end
     end
 


@@ -51,6 +40,9 @@ class Vote < ActiveRecord::Base
   end
 
   def save_rankings
   end
 
   def save_rankings

+    self.votes # i need to initalize this before destroying rankings
+               # or else the ranks themselves show up as nil
+

     destroy_rankings
     self.votes.each_with_index do |candidate_id, index| 
       ranking = Ranking.new
     destroy_rankings
     self.votes.each_with_index do |candidate_id, index| 
       ranking = Ranking.new