Merge branch 'master' of github.com:allourideas/pairwise2

Dhruv Kapadia
2 parents 371cfdf9 8d72506e
Showing 1 changed file with 2 additions and 0 deletions Show diff stats
app/models/vote.rb
@@ -18,6 +18,8 @@ class Vote &lt; ActiveRecord::Base
   named_scope :with_voter_ids, lambda { |*args| {:conditions => {:voter_id=> args.first }} }
   named_scope :active, :include => :choice, :conditions => { 'choices.active' => true }
  
+  serialize :tracking
+
   after_create :update_winner_choice, :update_loser_choice
  
   def update_winner_choice
...	...	@@ -18,6 +18,8 @@ class Vote < ActiveRecord::Base
18	18	named_scope :with_voter_ids, lambda { \|*args\| {:conditions => {:voter_id=> args.first }} }
19	19	named_scope :active, :include => :choice, :conditions => { 'choices.active' => true }
20	20
	21	+ serialize :tracking
	22	+
21	23	after_create :update_winner_choice, :update_loser_choice
22	24
23	25	def update_winner_choice
...	...