Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-08-28 13:12:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Brown 2016-02-22 21:28:20 +00:00
parent c86a122d80
commit 3ab09ef708
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ class BookController extends Controller
$this->checkPermission('book-update'); $this->checkPermission('book-update');
$book = $this->bookRepo->getBySlug($bookSlug); $book = $this->bookRepo->getBySlug($bookSlug);
$bookChildren = $this->bookRepo->getChildren($book); $bookChildren = $this->bookRepo->getChildren($book);
$books = $this->bookRepo->getAll(); $books = $this->bookRepo->getAll(false);
$this->setPageTitle('Sort Book ' . $book->getShortName()); $this->setPageTitle('Sort Book ' . $book->getShortName());
return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]); return view('books/sort', ['book' => $book, 'current' => $book, 'books' => $books, 'bookChildren' => $bookChildren]);
} }

12
app/Repos/BookRepo.php
View File

@ -14,8 +14,8 @@ class BookRepo
/** /**
* BookRepo constructor. * BookRepo constructor.
* @param Book $book * @param Book $book
* @param PageRepo $pageRepo * @param PageRepo $pageRepo
* @param ChapterRepo $chapterRepo * @param ChapterRepo $chapterRepo
*/ */
public function __construct(Book $book, PageRepo $pageRepo, ChapterRepo $chapterRepo) public function __construct(Book $book, PageRepo $pageRepo, ChapterRepo $chapterRepo)
@ -42,7 +42,9 @@ class BookRepo
*/ */
public function getAll($count = 10) 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 * @param bool|false $currentId
* @return bool * @return bool
*/ */
@ -175,7 +177,7 @@ class BookRepo
/** /**
* Provides a suitable slug for the given book name. * Provides a suitable slug for the given book name.
* Ensures the returned slug is unique in the system. * Ensures the returned slug is unique in the system.
* @param string $name * @param string $name
* @param bool|false $currentId * @param bool|false $currentId
* @return string * @return string
*/ */