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

diff --cc app/Entities/Repos/EntityRepo.php
index 0000000000000000000000000000000000000000,0dd0fbb0af650f0e3c050171a48673a030a55ee3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/app/Entities/Repos/EntityRepo.php
+++ b/app/Entities/Repos/EntityRepo.php

diff --cc app/Http/Controllers/BookController.php
index bddfe3f6db005ceb8aa5857d4e44dcb399d57f17,35f62012ab36a3a40c72813817cc7fb19c0ce101..2213dedbadd3213227a915895d9a5c4b597ced84
--- 1/app/Http/Controllers/BookController.php
--- 2/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@@ -113,7 -147,10 +113,8 @@@ class BookController extends Controlle
      public function show(Request $request, string $slug)
      {
          $book = $this->bookRepo->getBySlug($slug);
 -        $this->checkOwnablePermission('book-view', $book);
 -
 -        $bookChildren = $this->bookRepo->getBookChildren($book);
 -        $bookParentShelves = $this->bookRepo->getBookParentShelves($book);
 +        $bookChildren = (new BookContents($book))->getTree(true);
++        $bookParentShelves = $book->shelves()->visible();
  
          Views::add($book);
          if ($request->has('shelf')) {

diff --cc tests/Entity/BookShelfTest.php
Simple merge