Rolled out new permissions system throughout application

[bookstack] / app / Services / ActivityService.php

diff --git a/app/Services/ActivityService.php b/app/Services/ActivityService.php
index d0029b6c4b450d053e6750248b37d7c4082f17cb..54e92266765e2040cd2b947c1e4c32edb19c04a3 100644 (file)
--- a/app/Services/ActivityService.php
+++ b/app/Services/ActivityService.php
@@ -105,8 +105,16 @@ class ActivityService
      */
     public function entityActivity($entity, $count = 20, $page = 0)
     {
-        $activity = $entity->hasMany('BookStack\Activity')->orderBy('created_at', 'desc')
-            ->skip($count * $page)->take($count)->get();
+        if ($entity->isA('book')) {
+            $query = $this->activity->where('book_id', '=', $entity->id);
+        } else {
+            $query = $this->activity->where('entity_type', '=', get_class($entity))
+                ->where('entity_id', '=', $entity->id);
+        }
+        
+        $activity = $this->restrictionService
+            ->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')
+            ->orderBy('created_at', 'desc')->skip($count * $page)->take($count)->get();
 
         return $this->filterSimilar($activity);
     }