* Loads the book slug onto child elements to prevent access database access for getting the slug.
* @param Book $book
* @param bool $filterDrafts
+ * @param bool $renderPages
* @return mixed
*/
- public function getBookChildren(Book $book, $filterDrafts = false)
+ public function getBookChildren(Book $book, $filterDrafts = false, $renderPages = false)
{
- $q = $this->permissionService->bookChildrenQuery($book->id, $filterDrafts)->get();
+ $q = $this->permissionService->bookChildrenQuery($book->id, $filterDrafts, $renderPages)->get();
$entities = [];
$parents = [];
$tree = [];
foreach ($q as $index => $rawEntity) {
if ($rawEntity->entity_type === 'BookStack\\Page') {
$entities[$index] = $this->page->newFromBuilder($rawEntity);
+ if ($renderPages) {
+ $entities[$index]->html = $rawEntity->description;
+ $entities[$index]->html = $this->renderPage($entities[$index]);
+ };
} else if ($rawEntity->entity_type === 'BookStack\\Chapter') {
$entities[$index] = $this->chapter->newFromBuilder($rawEntity);
$key = $entities[$index]->entity_type . ':' . $entities[$index]->id;
public function restorePageRevision(Page $page, Book $book, $revisionId)
{
$this->savePageRevision($page);
- $revision = $this->getById('page_revision', $revisionId);
+ $revision = $page->revisions()->where('id', '=', $revisionId)->first();
$page->fill($revision->toArray());
$page->slug = $this->findSuitableSlug('page', $page->name, $page->id, $book->id);
$page->text = strip_tags($page->html);