[Git][noosfero/noosfero][master] recent_activities: displays only action trackers on block

[Daniela Feitosa]

Daniela Feitosa pushed to branch master at Noosfero / noosfero


Commits:
4d031bf1 by Daniela Soares Feitosa at 2016-07-06T14:20:52+00:00
recent_activities: displays only action trackers on block

The profile activities returns action trackers and scraps, but the
scraps should not be displayed on recent activities block. Only the
action tracker records

Related to merge request !972

- - - - -


2 changed files:

- plugins/recent_activities/lib/recent_activities_plugin/activities_block.rb
- plugins/recent_activities/test/unit/recent_activities_block_test.rb


Changes:

=====================================
plugins/recent_activities/lib/recent_activities_plugin/activities_block.rb
=====================================
--- a/plugins/recent_activities/lib/recent_activities_plugin/activities_block.rb
+++ b/plugins/recent_activities/lib/recent_activities_plugin/activities_block.rb
@@ -7,7 +7,8 @@ class RecentActivitiesPlugin::ActivitiesBlock < Block
   end
 
   def activities
-    list = self.limit.nil? ? owner.activities : owner.activities.limit(self.get_limit)
+    activities = owner.activities.where(activity_type: ActionTracker::Record.to_s)
+    list = self.limit.nil? ? activities : activities.limit(self.get_limit)
     list.map(&:activity)
   end
 


=====================================
plugins/recent_activities/test/unit/recent_activities_block_test.rb
=====================================
--- a/plugins/recent_activities/test/unit/recent_activities_block_test.rb
+++ b/plugins/recent_activities/test/unit/recent_activities_block_test.rb
@@ -36,6 +36,22 @@ class RecentActivitiesBlockTest < ActiveSupport::TestCase
 
     assert_equal [a2].map(&:id), block.activities.map(&:id)
   end
+
+  should 'return only action tracker records as activities' do
+    profile = create_user('testuser').person
+    friend = create_user('friend').person
+    scrap = create(Scrap, defaults_for_scrap(sender: friend, receiver: profile))
+    a1 = fast_create(ActionTracker::Record, user_id: profile.id, created_at: Time.now, updated_at: Time.now)
+    a2 = fast_create(ActionTracker::Record, user_id: profile.id, created_at: Time.now, updated_at: Time.now)
+    ProfileActivity.create! profile_id: profile.id, activity: a1
+    ProfileActivity.create! profile_id: profile.id, activity: a2
+
+    block = RecentActivitiesPlugin::ActivitiesBlock.new
+    block.stubs(:owner).returns(profile)
+
+    assert_equal [a2, a1, scrap], block.owner.activities.map(&:activity)
+    assert_equal [a2, a1], block.activities
+  end
 end
 
 require 'boxes_helper'



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/4d031bf1beeb7149718fa8b64860089546c1bfcc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160706/67dc0be5/attachment-0001.html>