X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/1ef3925927fb35483da98af08f9fc175d5502708..3e0d5a9b6af9ec1283b0c0e8cfae6cca9c2bea3a:/app/models/vote.rb?ds=sidebyside

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 8852fa5..21b5408 100644
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -71,16 +71,6 @@ class Vote < ActiveRecord::Base
     confirmed == 1
   end
   
-  def votestring=(string="")
-    candidate_ids = voter.election.candidates.sort.collect \
-      { |candidate| candidate.id.to_i }
-      
-    rel_votes = string.split("").collect { |vote| vote.to_i }
-    
-    # covert relative orders to absolute candidate ids
-    self.votes = rel_votes.collect { |vote| candidate_ids[ vote - 1 ] }
-  end
-
   def votestring
     # create a mapping of candidates ids and the relative order of the
     # candidates as they appear when sorted alphabetically
@@ -90,7 +80,7 @@ class Vote < ActiveRecord::Base
     end
 
     # assemble the votestring
-    self.votes.collect {|v| cand_relnums[v]}.join("")
+    self.votes.collect {|v| (cand_relnums[v] + 64).chr}.join("")
   end
 
   # the following subroutine is used for quickvotes, but need for elections now