webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

Fixed issues preventing breadcrumb navigation menus from opening

Browse Source 
- Added tests to cover endpoint

Fixes #1884
This commit is contained in:
Dan Brown
2020-02-15 19:09:33 +00:00
parent 5978d9a0d3
commit 6caedc7a37
3 changed files with 80 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Entities/Book.php
View File

@@ -115,7 +115,7 @@ class Book extends Entity implements HasCoverImage
{
$pages = $this->directPages()->visible()->get();
$chapters = $this->chapters()->visible()->get();
return $pages->contact($chapters)->sortBy('priority')->sortByDesc('draft');
return $pages->concat($chapters)->sortBy('priority')->sortByDesc('draft');
}
/**

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

@@ -109,7 +109,7 @@ class SearchController extends Controller
// Page in chapter
if ($entity->isA('page') && $entity->chapter) {
$entities = $entity->chapter->visiblePages();
$entities = $entity->chapter->getVisiblePages();
}
// Page in book or chapter