Added test to cover export body start/end partial usage

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

diff --git a/app/Http/Controllers/PageRevisionController.php b/app/Http/Controllers/PageRevisionController.php
index 4c43330164b743133490dbdf8e764cdfc2836383..08651896069910ca8ac132b66ee6efb0e917c3bc 100644 (file)
--- a/app/Http/Controllers/PageRevisionController.php
+++ b/app/Http/Controllers/PageRevisionController.php
@@ -1,13 +1,16 @@
-<?php namespace BookStack\Http\Controllers;
+<?php

 
 

-use BookStack\Entities\Tools\PageContent;
+namespace BookStack\Http\Controllers;
+
+use BookStack\Actions\ActivityType;

 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Repos\PageRepo;

+use BookStack\Entities\Tools\PageContent;

 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;

+use BookStack\Facades\Activity;

 use Ssddanbrown\HtmlDiff\Diff;
 
 class PageRevisionController extends Controller
 {
 use Ssddanbrown\HtmlDiff\Diff;
 
 class PageRevisionController extends Controller
 {

-

     protected $pageRepo;
 
     /**
     protected $pageRepo;
 
     /**


@@ -20,20 +23,23 @@ class PageRevisionController extends Controller
 
     /**
      * Shows the last revisions for this page.
 
     /**
      * Shows the last revisions for this page.

+     *

      * @throws NotFoundException
      */
     public function index(string $bookSlug, string $pageSlug)
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()]));
      * @throws NotFoundException
      */
     public function index(string $bookSlug, string $pageSlug)
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
         $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()]));

+

         return view('pages.revisions', [
         return view('pages.revisions', [

-            'page' => $page,
-            'current' => $page
+            'page'    => $page,
+            'current' => $page,

         ]);
     }
 
     /**
      * Shows a preview of a single revision.
         ]);
     }
 
     /**
      * Shows a preview of a single revision.

+     *

      * @throws NotFoundException
      */
     public function show(string $bookSlug, string $pageSlug, int $revisionId)
      * @throws NotFoundException
      */
     public function show(string $bookSlug, string $pageSlug, int $revisionId)


@@ -50,16 +56,18 @@ class PageRevisionController extends Controller
         $page->html = (new PageContent($page))->render();
 
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));
         $page->html = (new PageContent($page))->render();
 
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName' => $page->getShortName()]));

+

         return view('pages.revision', [
         return view('pages.revision', [

-            'page' => $page,
-            'book' => $page->book,
-            'diff' => null,
-            'revision' => $revision
+            'page'     => $page,
+            'book'     => $page->book,
+            'diff'     => null,
+            'revision' => $revision,

         ]);
     }
 
     /**
      * Shows the changes of a single revision.
         ]);
     }
 
     /**
      * Shows the changes of a single revision.

+     *

      * @throws NotFoundException
      */
     public function changes(string $bookSlug, string $pageSlug, int $revisionId)
      * @throws NotFoundException
      */
     public function changes(string $bookSlug, string $pageSlug, int $revisionId)


@@ -81,15 +89,16 @@ class PageRevisionController extends Controller
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
 
         return view('pages.revision', [
         $this->setPageTitle(trans('entities.pages_revision_named', ['pageName'=>$page->getShortName()]));
 
         return view('pages.revision', [

-            'page' => $page,
-            'book' => $page->book,
-            'diff' => $diff,
-            'revision' => $revision
+            'page'     => $page,
+            'book'     => $page->book,
+            'diff'     => $diff,
+            'revision' => $revision,

         ]);
     }
 
     /**
      * Restores a page using the content of the specified revision.
         ]);
     }
 
     /**
      * Restores a page using the content of the specified revision.

+     *

      * @throws NotFoundException
      */
     public function restore(string $bookSlug, string $pageSlug, int $revisionId)
      * @throws NotFoundException
      */
     public function restore(string $bookSlug, string $pageSlug, int $revisionId)


@@ -104,6 +113,7 @@ class PageRevisionController extends Controller
 
     /**
      * Deletes a revision using the id of the specified revision.
 
     /**
      * Deletes a revision using the id of the specified revision.

+     *

      * @throws NotFoundException
      */
     public function destroy(string $bookSlug, string $pageSlug, int $revId)
      * @throws NotFoundException
      */
     public function destroy(string $bookSlug, string $pageSlug, int $revId)


@@ -116,17 +126,17 @@ class PageRevisionController extends Controller
             throw new NotFoundException("Revision #{$revId} not found");
         }
 
             throw new NotFoundException("Revision #{$revId} not found");
         }
 

-        // Get the current revision for the page
-        $currentRevision = $page->getCurrentRevision();
-
-        // Check if its the latest revision, cannot delete latest revision.
-        if (intval($currentRevision->id) === intval($revId)) {
+        // Check if it's the latest revision, cannot delete the latest revision.
+        if (intval($page->currentRevision->id ?? null) === intval($revId)) {

             $this->showErrorNotification(trans('entities.revision_cannot_delete_latest'));
             $this->showErrorNotification(trans('entities.revision_cannot_delete_latest'));

+

             return redirect($page->getUrl('/revisions'));
         }
 
         $revision->delete();
             return redirect($page->getUrl('/revisions'));
         }
 
         $revision->delete();

+        Activity::add(ActivityType::REVISION_DELETE, $revision);

         $this->showSuccessNotification(trans('entities.revision_delete_success'));
         $this->showSuccessNotification(trans('entities.revision_delete_success'));

+

         return redirect($page->getUrl('/revisions'));
     }
 }
         return redirect($page->getUrl('/revisions'));
     }
 }