BookStack Code Mirror - bookstack/blobdiff - app/Entities/Controllers/PageController.php

diff --git a/app/Entities/Controllers/PageController.php b/app/Entities/Controllers/PageController.php

index f2cd729c6767daf4e3fe857c0768e16f5be2accb..eab53bb2510c361a0b849eee542f2eb8214326bc 100644 (file)

--- a/app/Entities/Controllers/PageController.php

+++ b/app/Entities/Controllers/PageController.php

@@ -7,7 +7,6 @@ use BookStack\Activity\Tools\CommentTree;

use BookStack\Activity\Tools\UserEntityWatchOptions;

use BookStack\Entities\Models\Book;

use BookStack\Entities\Models\Chapter;

-use BookStack\Entities\Models\Page;

use BookStack\Entities\Queries\EntityQueries;

use BookStack\Entities\Queries\PageQueries;

use BookStack\Entities\Repos\PageRepo;

@@ -31,7 +30,7 @@ class PageController extends Controller

{

public function __construct(

protected PageRepo $pageRepo,

- protected PageQueries $pageQueries,

+ protected PageQueries $queries,

protected EntityQueries $entityQueries,

protected ReferenceFetcher $referenceFetcher

) {

@@ -44,7 +43,12 @@ class PageController extends Controller

*/

public function create(string $bookSlug, string $chapterSlug = null)

{

- $parent = $this->pageRepo->getParentFromSlugs($bookSlug, $chapterSlug);

+ if ($chapterSlug) {

+ $parent = $this->entityQueries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);

+ } else {

+ $parent = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);

+ }

+

$this->checkOwnablePermission('page-create', $parent);

// Redirect to draft edit screen if signed in

@@ -71,7 +75,12 @@ class PageController extends Controller

'name' => ['required', 'string', 'max:255'],

]);

- $parent = $this->pageRepo->getParentFromSlugs($bookSlug, $chapterSlug);

+ if ($chapterSlug) {

+ $parent = $this->entityQueries->chapters->findVisibleBySlugsOrFail($bookSlug, $chapterSlug);

+ } else {

+ $parent = $this->entityQueries->books->findVisibleBySlugOrFail($bookSlug);

+ }

+

$this->checkOwnablePermission('page-create', $parent);

$page = $this->pageRepo->getNewDraftPage($parent);

@@ -89,10 +98,10 @@ class PageController extends Controller

*/

public function editDraft(Request $request, string $bookSlug, int $pageId)

{

- $draft = $this->pageRepo->getById($pageId);

+ $draft = $this->queries->findVisibleByIdOrFail($pageId);

$this->checkOwnablePermission('page-create', $draft->getParent());

- $editorData = new PageEditorData($draft, $this->pageRepo, $request->query('editor', ''));

+ $editorData = new PageEditorData($draft, $this->entityQueries, $request->query('editor', ''));

$this->setPageTitle(trans('entities.pages_edit_draft'));

return view('pages.edit', $editorData->getViewData());

@@ -109,7 +118,7 @@ class PageController extends Controller

$this->validate($request, [

'name' => ['required', 'string', 'max:255'],

]);

- $draftPage = $this->pageRepo->getById($pageId);

+ $draftPage = $this->queries->findVisibleByIdOrFail($pageId);

$this->checkOwnablePermission('page-create', $draftPage->getParent());

$page = $this->pageRepo->publishDraft($draftPage, $request->all());

@@ -126,11 +135,12 @@ class PageController extends Controller

public function show(string $bookSlug, string $pageSlug)

{

try {

- $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);

+ $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);

} catch (NotFoundException $e) {

- $page = $this->pageRepo->getByOldSlug($bookSlug, $pageSlug);

+ $revision = $this->entityQueries->revisions->findLatestVersionBySlugs($bookSlug, $pageSlug);

+ $page = $revision->page ?? null;

- if ($page === null) {

+ if (is_null($page)) {

throw $e;

}

@@ -171,7 +181,7 @@ class PageController extends Controller

*/

public function getPageAjax(int $pageId)

{

- $page = $this->pageRepo->getById($pageId);

+ $page = $this->queries->findVisibleByIdOrFail($pageId);

$page->setHidden(array_diff($page->getHidden(), ['html', 'markdown']));

$page->makeHidden(['book']);

@@ -185,10 +195,10 @@ class PageController extends Controller

*/

public function edit(Request $request, string $bookSlug, string $pageSlug)

{

- $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);

+ $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);

$this->checkOwnablePermission('page-update', $page);

- $editorData = new PageEditorData($page, $this->pageRepo, $request->query('editor', ''));

+ $editorData = new PageEditorData($page, $this->entityQueries, $request->query('editor', ''));

if ($editorData->getWarnings()) {

$this->showWarningNotification(implode("\n", $editorData->getWarnings()));

}

@@ -209,7 +219,7 @@ class PageController extends Controller

$this->validate($request, [

'name' => ['required', 'string', 'max:255'],

]);

- $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);

+ $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);

$this->checkOwnablePermission('page-update', $page);

$this->pageRepo->update($page, $request->all());

@@ -224,7 +234,7 @@ class PageController extends Controller

*/

public function saveDraft(Request $request, int $pageId)

{

- $page = $this->pageRepo->getById($pageId);

+ $page = $this->queries->findVisibleByIdOrFail($pageId);

$this->checkOwnablePermission('page-update', $page);

if (!$this->isSignedIn()) {

@@ -249,7 +259,7 @@ class PageController extends Controller

*/

public function redirectFromLink(int $pageId)

{

- $page = $this->pageRepo->getById($pageId);

+ $page = $this->queries->findVisibleByIdOrFail($pageId);

return redirect($page->getUrl());

}

@@ -261,12 +271,12 @@ class PageController extends Controller

*/

public function showDelete(string $bookSlug, string $pageSlug)

{

- $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);

+ $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);

$this->checkOwnablePermission('page-delete', $page);

$this->setPageTitle(trans('entities.pages_delete_named', ['pageName' => $page->getShortName()]));

$usedAsTemplate =

- Book::query()->where('default_template_id', '=', $page->id)->count() > 0 ||

- Chapter::query()->where('default_template_id', '=', $page->id)->count() > 0;

+ $this->entityQueries->books->start()->where('default_template_id', '=', $page->id)->count() > 0 ||

+ $this->entityQueries->chapters->start()->where('default_template_id', '=', $page->id)->count() > 0;

return view('pages.delete', [

'book' => $page->book,

@@ -283,12 +293,12 @@ class PageController extends Controller

*/

public function showDeleteDraft(string $bookSlug, int $pageId)

{

- $page = $this->pageRepo->getById($pageId);

+ $page = $this->queries->findVisibleByIdOrFail($pageId);

$this->checkOwnablePermission('page-update', $page);

$this->setPageTitle(trans('entities.pages_delete_draft_named', ['pageName' => $page->getShortName()]));

$usedAsTemplate =

- Book::query()->where('default_template_id', '=', $page->id)->count() > 0 ||

- Chapter::query()->where('default_template_id', '=', $page->id)->count() > 0;

+ $this->entityQueries->books->start()->where('default_template_id', '=', $page->id)->count() > 0 ||

+ $this->entityQueries->chapters->start()->where('default_template_id', '=', $page->id)->count() > 0;

return view('pages.delete', [

'book' => $page->book,

@@ -306,7 +316,7 @@ class PageController extends Controller

*/

public function destroy(string $bookSlug, string $pageSlug)

{

- $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);

+ $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);

$this->checkOwnablePermission('page-delete', $page);

$parent = $page->getParent();

@@ -323,7 +333,7 @@ class PageController extends Controller

*/

public function destroyDraft(string $bookSlug, int $pageId)

{

- $page = $this->pageRepo->getById($pageId);

+ $page = $this->queries->findVisibleByIdOrFail($pageId);

$book = $page->book;

$chapter = $page->chapter;

$this->checkOwnablePermission('page-update', $page);

@@ -348,7 +358,9 @@ class PageController extends Controller

$query->scopes('visible');

};

- $pages = Page::visible()->with(['updatedBy', 'book' => $visibleBelongsScope, 'chapter' => $visibleBelongsScope])

+ $pages = $this->queries->visibleForList()

+ ->addSelect('updated_by')

+ ->with(['updatedBy', 'book' => $visibleBelongsScope, 'chapter' => $visibleBelongsScope])

->orderBy('updated_at', 'desc')

->paginate(20)

->setPath(url('/pages/recently-updated'));

@@ -370,7 +382,7 @@ class PageController extends Controller

*/

public function showMove(string $bookSlug, string $pageSlug)

{

- $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);

+ $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);

$this->checkOwnablePermission('page-update', $page);

$this->checkOwnablePermission('page-delete', $page);

@@ -388,7 +400,7 @@ class PageController extends Controller

*/

public function move(Request $request, string $bookSlug, string $pageSlug)

{

- $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);

+ $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);

$this->checkOwnablePermission('page-update', $page);

$this->checkOwnablePermission('page-delete', $page);

@@ -417,7 +429,7 @@ class PageController extends Controller

*/

public function showCopy(string $bookSlug, string $pageSlug)

{

- $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);

+ $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);

$this->checkOwnablePermission('page-view', $page);

session()->flashInput(['name' => $page->name]);

@@ -435,7 +447,7 @@ class PageController extends Controller

*/

public function copy(Request $request, Cloner $cloner, string $bookSlug, string $pageSlug)

{

- $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);

+ $page = $this->queries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);

$this->checkOwnablePermission('page-view', $page);

$entitySelection = $request->get('entity_selection') ?: null;