colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automatic Restored Revision Changelog Summary Text

This commit is contained in:
Anthony Ronda 2020-11-03 20:46:47 -05:00
parent 82e671a06d
commit 34dc4a1b6d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Entities/Repos/PageRepo.php
View File

@ -273,9 +273,10 @@ class PageRepo
public function restoreRevision(Page $page, int $revisionId): Page public function restoreRevision(Page $page, int $revisionId): Page
{ {
$page->revision_count++; $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()); $page->fill($revision->toArray());
$content = new PageContent($page); $content = new PageContent($page);
$content->setNewHTML($revision->html); $content->setNewHTML($revision->html);

1
resources/lang/en/entities.php
View File

@ -208,6 +208,7 @@ return [
'pages_revisions' => 'Page Revisions', 'pages_revisions' => 'Page Revisions',
'pages_revisions_named' => 'Page Revisions for :pageName', 'pages_revisions_named' => 'Page Revisions for :pageName',
'pages_revision_named' => 'Page Revision 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_created_by' => 'Created By',
'pages_revisions_date' => 'Revision Date', 'pages_revisions_date' => 'Revision Date',
'pages_revisions_number' => '#', 'pages_revisions_number' => '#',