From 3ab09ef70871320ba59f24dd65b56cdcd3402123 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Mon, 22 Feb 2016 21:28:20 +0000 Subject: [PATCH] Fixed issue with the book sort not showing all books in sidebar --- app/Http/Controllers/BookController.php | 2 +- app/Repos/BookRepo.php | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/BookController.php b/app/Http/Controllers/BookController.php index a4365d605..d577a85b1 100644 --- 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 363a3b250..d8a24c099 100644 --- 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 */