Skip to content

Commit ec0b038

Browse files
committed
Permissions: Tweaks/fixed during review of revision-view-all changes
1 parent e7e019d commit ec0b038

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

app/Entities/Controllers/PageRevisionController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ public function changes(string $bookSlug, string $pageSlug, int $revisionId)
134134
*/
135135
public function restore(string $bookSlug, string $pageSlug, int $revisionId)
136136
{
137-
$page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
138137
$this->checkPermission(Permission::RevisionViewAll);
138+
$page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
139139
$this->checkOwnablePermission(Permission::PageUpdate, $page);
140140

141141
$page = $this->pageRepo->restoreRevision($page, $revisionId);
@@ -150,8 +150,8 @@ public function restore(string $bookSlug, string $pageSlug, int $revisionId)
150150
*/
151151
public function destroy(string $bookSlug, string $pageSlug, int $revId)
152152
{
153-
$page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
154153
$this->checkPermission(Permission::RevisionViewAll);
154+
$page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
155155
$this->checkOwnablePermission(Permission::PageDelete, $page);
156156

157157
$revision = $page->revisions()->where('id', '=', $revId)->first();

database/migrations/2026_04_19_141616_add_revision_view_all_permission.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public function up(): void
2424
'page-view-all',
2525
])->get();
2626

27-
if (!$pageViewPermissions->count() === 0) {
27+
if ($pageViewPermissions->count() === 0) {
2828
return;
2929
}
3030

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
<small class="hide-over-m bold">{{ trans('common.delete') }}<br></small>
2020
<small>{{ trans('settings.role_controlled_by_page_delete') }}</small>
2121
</div>
22-
</div>
22+
</div>

0 commit comments

Comments
 (0)