starred/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-05-04 18:08:46 +03:00
Code Issues 784 Packages Projects Releases 15 Wiki Activity

Permissions: Tweaks/fixed during review of revision-view-all changes

Browse Source
This commit is contained in:
Dan Brown
2026-04-19 16:06:31 +01:00
parent e7e019d3d4
commit ec0b0384a2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Entities/Controllers/PageRevisionController.php
View File

@@ -134,8 +134,8 @@ class PageRevisionController extends Controller
*/ */
public function restore(string $bookSlug, string $pageSlug, int $revisionId) public function restore(string $bookSlug, string $pageSlug, int $revisionId)
{ {
$page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
$this->checkPermission(Permission::RevisionViewAll); $this->checkPermission(Permission::RevisionViewAll);
$page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
$this->checkOwnablePermission(Permission::PageUpdate, $page); $this->checkOwnablePermission(Permission::PageUpdate, $page);
$page = $this->pageRepo->restoreRevision($page, $revisionId); $page = $this->pageRepo->restoreRevision($page, $revisionId);
@@ -150,8 +150,8 @@ class PageRevisionController extends Controller
*/ */
public function destroy(string $bookSlug, string $pageSlug, int $revId) public function destroy(string $bookSlug, string $pageSlug, int $revId)
{ {
$page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
$this->checkPermission(Permission::RevisionViewAll); $this->checkPermission(Permission::RevisionViewAll);
$page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
$this->checkOwnablePermission(Permission::PageDelete, $page); $this->checkOwnablePermission(Permission::PageDelete, $page);
$revision = $page->revisions()->where('id', '=', $revId)->first(); $revision = $page->revisions()->where('id', '=', $revId)->first();

2
database/migrations/2026_04_19_141616_add_revision_view_all_permission.php
View File

@@ -24,7 +24,7 @@ return new class extends Migration
'page-view-all', 'page-view-all',
])->get(); ])->get();
if (!$pageViewPermissions->count() === 0) { if ($pageViewPermissions->count() === 0) {
return; return;
} }

2
resources/views/settings/roles/parts/revisions-permissions-row.blade.php
View File

@@ -19,4 +19,4 @@
<small class="hide-over-m bold">{{ trans('common.delete') }}<br></small> <small class="hide-over-m bold">{{ trans('common.delete') }}<br></small>
<small>{{ trans('settings.role_controlled_by_page_delete') }}</small> <small>{{ trans('settings.role_controlled_by_page_delete') }}</small>
</div> </div>
</div> </div>