Fix vote_fu search to handle polymorphic models

Victor Costa
1 parent edbc6fc1
Showing 2 changed files with 5 additions and 5 deletions Show diff stats
vendor/plugins/vote_fu/lib/acts_as_voteable.rb
vendor/plugins/vote_fu/lib/models/vote.rb
@@ -149,9 +149,9 @@ module Juixe
         def voted_by?(voter, for_or_against = "all")
           options = (for_or_against == "all") ? {} : {:vote => (for_or_against ? 1 : -1)}
-          self.votes.exists?({:voter_id => voter.id, :voter_type => voter.class.name}.merge(options))
+          self.votes.exists?({:voter_id => voter.id, :voter_type => voter.class.base_class.name}.merge(options))
         end
       end
     end
   end
-end
 \ No newline at end of file
+end
 class Vote < ActiveRecord::Base
-  named_scope :for_voter,    lambda { |*args| {:conditions => ["voter_id = ? AND voter_type = ?", args.first.id, args.first.type.name]} }
-  named_scope :for_voteable, lambda { |*args| {:conditions => ["voteable_id = ? AND voteable_type = ?", args.first.id, args.first.type.name]} }
+  named_scope :for_voter,    lambda { |*args| {:conditions => ["voter_id = ? AND voter_type = ?", args.first.id, args.first.class.base_class.name]} }
+  named_scope :for_voteable, lambda { |*args| {:conditions => ["voteable_id = ? AND voteable_type = ?", args.first.id, args.first.class.base_class.name]} }
   named_scope :recent,       lambda { |*args| {:conditions => ["created_at > ?", (args.first || 2.weeks.ago).to_s(:db)]} }
   named_scope :descending, :order => "created_at DESC"
@@ -12,6 +12,6 @@ class Vote &lt; ActiveRecord::Base
   attr_accessible :vote, :voter, :voteable
   # Uncomment this to limit users to a single vote on each item. 
-  #validates_uniqueness_of :voteable_id, :scope => [:voteable_type, :voter_type, :voter_id]
+  validates_uniqueness_of :voteable_id, :scope => [:voteable_type, :voter_type, :voter_id]
 end