Merge branch 'fix_activities_filter' into 'master'

Changed activities filter

Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>

See merge request !337

app/policies/activity_policy.rb

@@ -9,7 +9,11 @@ class ActivityPolicy < ApplicationPolicy
     end
 
     def resolve
-      scope.includes(:owner,:recipient).where("privacy = 'public'").where.not(key: activities_filter).order('created_at DESC').all
+      if user.is_admin?
+        scope.includes(:owner,:recipient).order('created_at DESC').all
+      else
+        scope.includes(:owner,:recipient).where("privacy = 'public'").where(key: activities_filter).order('created_at DESC').all
+      end
     end
 
   end

app/services/activities_filter_service.rb

 module ActivitiesFilterService
 
   def activities_filtered
-    self.activities.where.not(key: activities_filter)
+    if !self.try(:draft?)
+      self.activities.where(key: activities_filter)
+    else
+      []
+    end
   end
 
   def activities_filter
-    [ 'complaint.update', 'complaint.destroy',
-      'complaint_reason.create', 'complaint_reason.update', 'complaint_reason.destroy',
-      'institution.create', 'institution.update', 'institution.destroy',
-      'review.update', 'review.destroy',
-      'rate.create', 'rate.update', 'rate.destroy',
-      'follow.create', 'follow.update', 'follow.destroy',
-      'share.create', 'share.update', 'share.destroy',
-      'view.create', 'view.update', 'view.destroy',
-      'tagging.create', 'tagging.update', 'tagging.destroy',
-      'bookmark.create', 'bookmark.update', 'bookmark.destroy',
-      'download.update', 'download.destroy',
-      'like.update'
+    [ 'complaint.create',
+      'collection.create', 'collection.update', 'collection.destroy',
+      'collection_item.create', 'collection_item.update', 'collection_item.destroy',
+      'learning_object.create', 'learning_object.update', 'learning_object.destroy',
+      'review.create',
+      'download.create',
+      'like.create', 'like.destroy'
     ]
   end
 end