From ec0b0384a20f10a5ec44197a3fd5ca8f9fc543aa Mon Sep 17 00:00:00 2001
From: Dan Brown <development@danb.me>
Date: Sun, 19 Apr 2026 16:06:31 +0100
Subject: [PATCH] Permissions: Tweaks/fixed during review of revision-view-all
 changes

---
 app/Entities/Controllers/PageRevisionController.php           | 4 ++--
 .../2026_04_19_141616_add_revision_view_all_permission.php    | 2 +-
 .../settings/roles/parts/revisions-permissions-row.blade.php  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Entities/Controllers/PageRevisionController.php b/app/Entities/Controllers/PageRevisionController.php
index 0d690cb2c..cc6b79bfe 100644
--- a/app/Entities/Controllers/PageRevisionController.php
+++ b/app/Entities/Controllers/PageRevisionController.php
@@ -134,8 +134,8 @@ class PageRevisionController extends Controller
      */
     public function restore(string $bookSlug, string $pageSlug, int $revisionId)
     {
-        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkPermission(Permission::RevisionViewAll);
+        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission(Permission::PageUpdate, $page);
 
         $page = $this->pageRepo->restoreRevision($page, $revisionId);
@@ -150,8 +150,8 @@ class PageRevisionController extends Controller
      */
     public function destroy(string $bookSlug, string $pageSlug, int $revId)
     {
-        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkPermission(Permission::RevisionViewAll);
+        $page = $this->pageQueries->findVisibleBySlugsOrFail($bookSlug, $pageSlug);
         $this->checkOwnablePermission(Permission::PageDelete, $page);
 
         $revision = $page->revisions()->where('id', '=', $revId)->first();
diff --git a/database/migrations/2026_04_19_141616_add_revision_view_all_permission.php b/database/migrations/2026_04_19_141616_add_revision_view_all_permission.php
index 5a0b9a09b..e4b51ff70 100644
--- a/database/migrations/2026_04_19_141616_add_revision_view_all_permission.php
+++ b/database/migrations/2026_04_19_141616_add_revision_view_all_permission.php
@@ -24,7 +24,7 @@ return new class extends Migration
                 'page-view-all',
             ])->get();
 
-        if (!$pageViewPermissions->count() === 0) {
+        if ($pageViewPermissions->count() === 0) {
             return;
         }
 
diff --git a/resources/views/settings/roles/parts/revisions-permissions-row.blade.php b/resources/views/settings/roles/parts/revisions-permissions-row.blade.php
index fe886a5d0..326925ef9 100644
--- a/resources/views/settings/roles/parts/revisions-permissions-row.blade.php
+++ b/resources/views/settings/roles/parts/revisions-permissions-row.blade.php
@@ -19,4 +19,4 @@
         <small class="hide-over-m bold">{{ trans('common.delete') }}<br></small>
         <small>{{ trans('settings.role_controlled_by_page_delete') }}</small>
     </div>
-</div>
\ No newline at end of file
+</div>