X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/31f5786e01fc5ed439f347c6979679612baca4fb..refs/pull/2303/head:/app/Http/Controllers/PageController.php diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 630f888ed..57d70fb32 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -163,6 +163,8 @@ class PageController extends Controller public function getPageAjax(int $pageId) { $page = $this->pageRepo->getById($pageId); + $page->setHidden(array_diff($page->getHidden(), ['html', 'markdown'])); + $page->addHidden(['book']); return response()->json($page); } @@ -304,11 +306,12 @@ class PageController extends Controller $this->checkOwnablePermission('page-delete', $page); $book = $page->book; + $parent = $page->chapter ?? $book; $this->pageRepo->destroy($page); Activity::addMessage('page_delete', $page->name, $book->id); $this->showSuccessNotification(trans('entities.pages_delete_success')); - return redirect($book->getUrl()); + return redirect($parent->getUrl()); } /**