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 471df8184ba468bacac054547271d264e19ccc48..de3aed7d9a7543dc61303b8f0a68ee7d3ac838c0 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;

@@ -18,6 +17,7 @@ use BookStack\Entities\Tools\PageContent;

use BookStack\Entities\Tools\PageEditActivity;

use BookStack\Entities\Tools\PageEditorData;

use BookStack\Exceptions\NotFoundException;

+use BookStack\Exceptions\NotifyException;

use BookStack\Exceptions\PermissionsException;

use BookStack\Http\Controller;

use BookStack\References\ReferenceFetcher;

@@ -42,7 +42,7 @@ class PageController extends Controller

*

* @throws Throwable

*/

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

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

{

if ($chapterSlug) {

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

@@ -70,7 +70,7 @@ class PageController extends Controller

*

* @throws ValidationException

*/

- public function createAsGuest(Request $request, string $bookSlug, string $chapterSlug = null)

+ public function createAsGuest(Request $request, string $bookSlug, ?string $chapterSlug = null)

{

$this->validate($request, [

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

@@ -197,7 +197,7 @@ class PageController extends Controller

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

{

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

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

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

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

if ($editorData->getWarnings()) {

@@ -359,7 +359,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'));