merged changes back from the production version

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

diff --git a/app/models/voter.rb b/app/models/voter.rb
index 7139b899a725fd6b32de66393f7decc58a5d99c8..012c795a075279e68fd362a51f3f376056695d74 100644 (file)
--- a/app/models/voter.rb
+++ b/app/models/voter.rb
@@ -1,8 +1,20 @@
 class Voter < ActiveRecord::Base
   belongs_to :election
   has_one :vote
+  
+  def reset_vote
+    self.vote.destroy
+    self.reload
+  end
+  
+  def destroy
+    vote.destroy if vote
+    super
+  end
 
+  def voted?
+    vote.confirmed == 1
+  end
 end
 
 
-