Updated the system to Rails 1.2.

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

diff --git a/app/models/voter.rb b/app/models/voter.rb
old mode 100644 (file)
new mode 100755 (executable)
index e9b3e9e..f229909
--- a/app/models/voter.rb
+++ b/app/models/voter.rb
@@ -2,16 +2,14 @@ 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 destroy
+    vote.destroy if vote
+    super
   end
 
+  def voted?
+    vote.confirmed == 1
+  end
 end
 
 
-