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

Merge branch 'feature/#1598' of git://github.com/cw1998/BookStack into cw1998-feature/#1598

Browse Source
This commit is contained in:
Dan Brown
2020-04-09 17:18:37 +01:00
parent e83d2eedbb 4ad4dfa55a
commit 898cedf536
5 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BookController.php
View File

@ -114,6 +114,7 @@ class BookController extends Controller
{
$book = $this->bookRepo->getBySlug($slug);
$bookChildren = (new BookContents($book))->getTree(true);
$bookParentShelves = $book->shelves()->visible();
Views::add($book);
if ($request->has('shelf')) {
@ -125,6 +126,7 @@ class BookController extends Controller
'book' => $book,
'current' => $book,
'bookChildren' => $bookChildren,
'bookParentShelves' => $bookParentShelves,
'activity' => Activity::entityActivity($book, 20, 1)
]);
}