webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-30 04:23:11 +03:00
Code Activity

Fixed shelf activity display & updated book sort operation

Browse Source
This commit is contained in:
Dan Brown
2019-05-05 15:54:22 +01:00
parent 5910e00fb8
commit ba09dad1fe
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Actions/ActivityService.php
View File

@ -108,13 +108,17 @@ class ActivityService
if ($entity->isA('book')) {
$query = $this->activity->where('book_id', '=', $entity->id);
} else {
$query = $this->activity->where('entity_type', '=', get_class($entity))
$query = $this->activity->where('entity_type', '=', $entity->getMorphClass())
->where('entity_id', '=', $entity->id);
}
$activity = $this->permissionService
->filterRestrictedEntityRelations($query, 'activities', 'entity_id', 'entity_type')
->orderBy('created_at', 'desc')->with(['entity', 'user.avatar'])->skip($count * ($page - 1))->take($count)->get();
->orderBy('created_at', 'desc')
->with(['entity', 'user.avatar'])
->skip($count * ($page - 1))
->take($count)
->get();
return $this->filterSimilar($activity);
}