Walls improved to filter by by object_type

Marisayem · Jun 20, 2011 · abbcfa6 · abbcfa6
1 parent c251b93
commit abbcfa6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/models/activity.rb b/app/models/activity.rb
@@ -30,12 +30,16 @@ class Activity < ActiveRecord::Base
   has_many :activity_objects,
            :through => :activity_object_activities
 
-  scope :wall, lambda { |type, ties|
+  scope :wall, lambda { |type, ties, options|
     q = select("DISTINCT activities.*").
           roots.
           joins(:tie_activities).
           where('tie_activities.tie_id' => ties).
           order("created_at desc")
+
+    if options[:object_type].present?
+      q = q.joins(:activity_objects).where('activity_objects.object_type' => options[:object_type])
+    end
 
     # Profile wall is composed by original TieActivities. Not original are copies for followers
     if type == :profile

diff --git a/app/models/actor.rb b/app/models/actor.rb
@@ -397,7 +397,7 @@ def wall(type, options = {})
       ts = ts.related_by(Relation.normalize(options[:relation], :sender => self))
     end
 
-    Activity.wall type, ts.all
+    Activity.wall type, ts.all, options
   end
 
   def logo

diff --git a/lib/social_stream-base.rb b/lib/social_stream-base.rb
@@ -62,8 +62,8 @@ module TestHelpers
   @@objects = [ :post, :comment ]
 
   mattr_accessor :activity_forms
-  #@@activity_forms = [:attachment]
-  @@activity_forms = []
+  @@activity_forms = [:attachment]
+  #@@activity_forms = []
 
   class << self
     def setup