Changes as per code review, and fixes failing test cases.

[bookstack] / app / Http / Controllers / PageController.php

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 5979ceca803f694e1a258835861c27210e9b1be9..e3079047cac436c13873cdf8876841d98a23f165 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -2,7 +2,6 @@
 
 use Activity;
 use BookStack\Exceptions\NotFoundException;
-use BookStack\Exceptions\BadRequestException;
 use BookStack\Repos\EntityRepo;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\ExportService;
@@ -460,7 +459,7 @@ class PageController extends Controller
      * Deletes a revision using the id of the specified revision.
      * @param string $bookSlug
      * @param string $pageSlug
-     * @param int $revisionId
+     * @param int $revId
      * @throws NotFoundException
      * @throws BadRequestException
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
@@ -468,7 +467,7 @@ class PageController extends Controller
     public function destroyRevision($bookSlug, $pageSlug, $revId)
     {
         $page = $this->entityRepo->getBySlug('page', $pageSlug, $bookSlug);
-        $this->checkOwnablePermission('page-update', $page);
+        $this->checkOwnablePermission('page-delete', $page);
 
         $revision = $page->revisions()->where('id', '=', $revId)->first();
         if ($revision === null) {
@@ -476,14 +475,16 @@ class PageController extends Controller
         }
 
         // Get the current revision for the page
-        $current = $revision->getCurrent();
+        $currentRevision = $page->getCurrentRevision();
 
         // Check if its the latest revision, cannot delete latest revision.
-        if (intval($current->id) === intval($revId)) {
-            throw new BadRequestException("Cannot delete the current revision #{$revId}");
+        if (intval($currentRevision->id) === intval($revId)) {
+            session()->flash('error', trans('entities.revision_cannot_delete_latest'));
+            return response()->view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page], 400);
         }
 
         $revision->delete();
+        session()->flash('success', trans('entities.revision_delete_success'));
         return view('pages/revisions', ['page' => $page, 'book' => $page->book, 'current' => $page]);
     }