Fixed issue with the book sort not showing all books in sidebar

diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php
index a4365d6052645f261f13524ce2c682f4b7804c87..d577a85b134dcd060eebf72b2be744bc8914766e 100644 (file)
--- a/app/Http/Controllers/BookController.php
+++ b/app/Http/Controllers/BookController.php
@@ -157,7 +157,7 @@ class BookController extends Controller
         $this->checkPermission('book-update');
         $book = $this->bookRepo->getBySlug($bookSlug);
         $bookChildren = $this->bookRepo->getChildren($book);
-        $books = $this->bookRepo->getAll();
+        $books = $this->bookRepo->getAll(false);
         $this->setPageTitle('Sort Book ' . $book->getShortName());
         return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
     }

diff --git a/app/Repos/BookRepo.php b/app/Repos/BookRepo.php
index 363a3b25053a613564670fa3ff3fa3311808c909..d8a24c099734d6a24a757130d842fc14e7445c05 100644 (file)
--- a/app/Repos/BookRepo.php
+++ b/app/Repos/BookRepo.php
@@ -14,8 +14,8 @@ class BookRepo
 
     /**
      * BookRepo constructor.
-     * @param Book        $book
-     * @param PageRepo    $pageRepo
+     * @param Book $book
+     * @param PageRepo $pageRepo
      * @param ChapterRepo $chapterRepo
      */
     public function __construct(Book $book, PageRepo $pageRepo, ChapterRepo $chapterRepo)
@@ -42,7 +42,9 @@ class BookRepo
      */
     public function getAll($count = 10)
     {
-        return $this->book->orderBy('name', 'asc')->take($count)->get();
+        $bookQuery = $this->book->orderBy('name', 'asc');
+        if (!$count) return $bookQuery->get();
+        return $bookQuery->take($count)->get();
     }
 
     /**
@@ -159,7 +161,7 @@ class BookRepo
     }
 
     /**
-     * @param string     $slug
+     * @param string $slug
      * @param bool|false $currentId
      * @return bool
      */
@@ -175,7 +177,7 @@ class BookRepo
     /**
      * Provides a suitable slug for the given book name.
      * Ensures the returned slug is unique in the system.
-     * @param string     $name
+     * @param string $name
      * @param bool|false $currentId
      * @return string
      */