merge everything back from mainline branch

[selectricity] / app / models / voter.rb

diff --git a/app/models/voter.rb b/app/models/voter.rb
old mode 100755 (executable)
new mode 100644 (file)
index f229909..3a268f7
--- a/app/models/voter.rb
+++ b/app/models/voter.rb
@@ -1,7 +1,19 @@
+# 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.
+
 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