mergec minor changes from live

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

diff --git a/app/models/voter.rb b/app/models/voter.rb
index e9b3e9e2cfe4901a91df669815d6d8a0b944890f..5ffa30f6a6ad68341c0e94ad59df73419ac3688e 100644 (file)
--- a/app/models/voter.rb
+++ b/app/models/voter.rb
@@ -1,17 +1,38 @@
+# 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: 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/>.
+

 class Voter < ActiveRecord::Base
   belongs_to :election
   has_one :vote
 class Voter < ActiveRecord::Base
   belongs_to :election
   has_one :vote

-
-  def initialize(args)
-    super(args)
-    
-    token_generator = UniqueTokenGenerator.new( 16 )
-    until password and Voter.find_all( [ "password = ?", password ]).empty?
-      self.password = token_generator.token
-    end
+  
+  def reset_vote
+    self.vote.destroy
+    self.reload
+  end
+  
+  def destroy
+    vote.destroy if vote
+    super

   end
 
   end
 

+  def voted?
+    vote.confirmed == 1
+  end

 end
 
 
 end
 
 

-