Do some HTML escaping on election and candidate names

[selectricity] / app / models / vote.rb

diff --git a/app/models/vote.rb b/app/models/vote.rb
index 429e212377781d27aa4a5580d9dcb65abd5b19eb..62944e3301a5b6f07f77f475e1ef85ae8d314cc6 100644 (file)
--- a/app/models/vote.rb
+++ b/app/models/vote.rb
@@ -8,12 +8,14 @@ class Vote < ActiveRecord::Base
   after_update :save_rankings
   before_destroy :destroy_rankings
 
+  
+
   def to_s
     votes.join("")
   end
 
   def each
-    votes.each {|vote| yield vote}
+    self.votes.each {|vote| yield vote}
   end
 
   def votes
@@ -34,33 +36,41 @@ class Vote < ActiveRecord::Base
 
   def save_rankings
     destroy_rankings
-    self.votes.each_with_index do |candidate, index| 
+    self.votes.each_with_index do |candidate_id, index| 
       ranking = Ranking.new
       ranking.rank = index
-      ranking.candidate =  Candidate.find(candidate)
+      ranking.candidate =  Candidate.find(candidate_id)
       self.rankings << ranking
     end
   end
+  
+  def destroy
+    self.destroy_rankings
+    super
+  end
 
   def destroy_rankings 
     rankings.each { |ranking| ranking.destroy }
   end
 
-  def confirm!
-    self.confirmed = 1
+  def settime
+    self.time = Time.now
     self.save
+  end
 
-    token.destroy and token.reload if token
-    self.token = Token.new
+  def confirm!
+    self.confirmed = 1
     self.save
+    
+    unless self.voter.election.quickvote?
+      token.destroy and token.reload if token
+      self.token = Token.new
+      self.save
+    end
   end
 
   def confirm?
-    if confirm == 1
-      return true
-    else 
-      return false
-    end
+    confirmed == 1
   end
   
   def votestring=(string="")
@@ -73,4 +83,23 @@ class Vote < ActiveRecord::Base
     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
+    cand_relnums = {}
+    self.voter.election.candidates.sort.each_with_index do |c, i|
+      cand_relnums[c.id] = i + 1
+    end
+
+    # assemble the votestring
+    self.votes.collect {|v| cand_relnums[v]}.join("")
+  end
+
+  # the following subroutine is used for quickvotes. it creates a vote
+  # with the candidates listed in order of preference based on
+  # alphabetical order. it is meant to be manipulated and then confirmed
+  def set_defaults!
+    self.votes =  voter.election.candidates.sort.collect {|c| c.id }
+    self.save
+  end
 end