From: Dan Brown <redacted>
Date: Thu, 9 Apr 2020 16:18:37 +0000 (+0100)
Subject: Merge branch 'feature/#1598' of git://github.com/cw1998/BookStack into cw1998-feature... 
X-Git-Tag: v0.29.0~1^2~13
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/898cedf5362a43afcee85cf24c8352240cb54690?hp=--cc

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

898cedf5362a43afcee85cf24c8352240cb54690
diff --cc app/Entities/Repos/EntityRepo.php
index 000000000,0dd0fbb0a..e69de29bb
mode 000000,100644..100644
--- a/app/Entities/Repos/EntityRepo.php
+++ b/app/Entities/Repos/EntityRepo.php
diff --cc app/Http/Controllers/BookController.php
index bddfe3f6d,35f62012a..2213dedba
--- a/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')) {