Added "page_include_parse" theme event

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

diff --git a/app/Http/Controllers/PageRevisionController.php b/app/Http/Controllers/PageRevisionController.php
index d595a6e26fd797cb0c7693f473e0680a168caf3e..c4d5fbc7b37fc59ab6e946e37acb60e51bfb169c 100644 (file)
--- a/app/Http/Controllers/PageRevisionController.php
+++ b/app/Http/Controllers/PageRevisionController.php
@@ -2,18 +2,17 @@
 
 namespace BookStack\Http\Controllers;
 
 
 namespace BookStack\Http\Controllers;
 

+use BookStack\Actions\ActivityType;

 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Entities\Repos\PageRepo;
 use BookStack\Entities\Tools\PageContent;
 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 $pageRepo;

 
 

-    /**
-     * PageRevisionController constructor.
-     */

     public function __construct(PageRepo $pageRepo)
     {
         $this->pageRepo = $pageRepo;
     public function __construct(PageRepo $pageRepo)
     {
         $this->pageRepo = $pageRepo;


@@ -27,11 +26,19 @@ class PageRevisionController extends Controller
     public function index(string $bookSlug, string $pageSlug)
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);
     public function index(string $bookSlug, string $pageSlug)
     {
         $page = $this->pageRepo->getBySlug($bookSlug, $pageSlug);

-        $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName'=>$page->getShortName()]));
+        $revisions = $page->revisions()->select([
+            'id', 'page_id', 'name', 'created_at', 'created_by', 'updated_at',
+            'type', 'revision_number', 'summary',
+        ])
+            ->selectRaw("IF(markdown = '', false, true) as is_markdown")
+            ->with(['page.book', 'createdBy'])
+            ->get();
+
+        $this->setPageTitle(trans('entities.pages_revisions_named', ['pageName' => $page->getShortName()]));

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

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

         ]);
     }
 
         ]);
     }
 


@@ -124,17 +131,15 @@ 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'));
 
             return redirect($page->getUrl('/revisions'));
         }
 
         $revision->delete();
             $this->showErrorNotification(trans('entities.revision_cannot_delete_latest'));
 
             return redirect($page->getUrl('/revisions'));
         }
 
         $revision->delete();

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

         $this->showSuccessNotification(trans('entities.revision_delete_success'));
 
         return redirect($page->getUrl('/revisions'));
         $this->showSuccessNotification(trans('entities.revision_delete_success'));
 
         return redirect($page->getUrl('/revisions'));