Merge trunk

[selectricity] / app / models / voter.rb

diff --git a/app/models/voter.rb b/app/models/voter.rb
index c4700cbbef75d0a82fe8a598c8d454ce5ead4f42..f229909814c12fbd51beeb120061661ef87a67ec 100644 (file)
--- a/app/models/voter.rb
+++ b/app/models/voter.rb
@@ -2,17 +2,14 @@ class Voter < ActiveRecord::Base
   belongs_to :election
   has_one :vote
 
   belongs_to :election
   has_one :vote
 

-  before_create :create_password
-
-  def create_password
-    token_generator = UniqueTokenGenerator.new( 16 )
-    until password and not password.empty? \
-          and Voter.find_all( [ "password = ?", password ]).empty?
-      self.password = token_generator.token
-    end
+  def destroy
+    vote.destroy if vote
+    super

   end
 
   end
 

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

 end
 
 
 end
 
 

-