Merge from head -- breakage

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

diff --git a/app/models/voter.rb b/app/models/voter.rb
index a63ec67a68ccbf7c8e4d752bed82a0ef081fd9fd..f229909814c12fbd51beeb120061661ef87a67ec 100644 (file)
--- a/app/models/voter.rb
+++ b/app/models/voter.rb
@@ -1,3 +1,15 @@
 class Voter < ActiveRecord::Base
   belongs_to :election
 class Voter < ActiveRecord::Base
   belongs_to :election

+  has_one :vote
+
+  def destroy
+    vote.destroy if vote
+    super
+  end
+
+  def voted?
+    vote.confirmed == 1
+  end

 end
 end

+
+