Several fixes in activities

ging · Sep 16, 2010 · 6ee182f · 6ee182f
1 parent f46199b
commit 6ee182f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/activity.rb b/app/models/activity.rb
@@ -10,7 +10,7 @@ class Activity < ActiveRecord::Base
            :dependent => :destroy
 
   belongs_to :activity_verb
-  has_many :activity_object_activities
+  has_many :activity_object_activities, :dependent => :destroy
   has_many :activity_objects, :through => :activity_object_activities
 
   belongs_to :tie,
@@ -49,7 +49,7 @@ def liked_by(user) #:nodoc:
 
   # Does user like this activity?
   def liked_by?(user)
-    liked_by(user).any?
+    liked_by(user).present?
   end
 
   class << self

diff --git a/lib/action_controller/subactivity.rb b/lib/action_controller/subactivity.rb
@@ -11,7 +11,7 @@ def activity!
     end
 
     def tie
-      @tie ||= current_user.ties(:receiver => activity!.author,
+      @tie ||= current_user.ties(:receiver => activity!.receiver,
                                  :relation => activity!.relation).first
     end