Automatic Restored Revision Changelog Summary Text

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index e5f13463c388f781dd215338afb4af37cefaa7c5..1467feff5bbfa399545579ab9225dad7cb703746 100644 (file)
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -273,9 +273,10 @@ class PageRepo
     public function restoreRevision(Page $page, int $revisionId): Page
     {
         $page->revision_count++;
     public function restoreRevision(Page $page, int $revisionId): Page
     {
         $page->revision_count++;

-        $this->savePageRevision($page);
-

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

+        $summary = trans('entities.pages_revision_restored_from', ['id' => strval($revisionId), 'summary' => $revision->summary]);
+        $this->savePageRevision($page, $summary);
+

         $page->fill($revision->toArray());
         $content = new PageContent($page);
         $content->setNewHTML($revision->html);
         $page->fill($revision->toArray());
         $content = new PageContent($page);
         $content->setNewHTML($revision->html);

diff --git a/resources/lang/en/entities.php b/resources/lang/en/entities.php
index f64867a56c31736a1730d58c51f3fe0c088364d1..6de8328afc864de3ac0fef1a72588c7d5ffb3c96 100644 (file)
--- a/resources/lang/en/entities.php
+++ b/resources/lang/en/entities.php
@@ -208,6 +208,7 @@ return [
     'pages_revisions' => 'Page Revisions',
     'pages_revisions_named' => 'Page Revisions for :pageName',
     'pages_revision_named' => 'Page Revision for :pageName',
     'pages_revisions' => 'Page Revisions',
     'pages_revisions_named' => 'Page Revisions for :pageName',
     'pages_revision_named' => 'Page Revision for :pageName',

+    'pages_revision_restored_from' => 'Restored from #:id ":summary"',

     'pages_revisions_created_by' => 'Created By',
     'pages_revisions_date' => 'Revision Date',
     'pages_revisions_number' => '#',
     'pages_revisions_created_by' => 'Created By',
     'pages_revisions_date' => 'Revision Date',
     'pages_revisions_number' => '#',