github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-05 09:34:37 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed restore revision save order, Added restore summary testing

Browse Source 
Found during review of #2353, A revision would be stored before a
restore which would result with a duplicate revision and the new summary
would be assigned against the wrong content.
This change saves the revison after restore and adds test to check the
content and summary text.
This commit is contained in:
Dan Brown
2021-01-02 16:42:05 +00:00
parent 83d77d5166
commit 024b0d8a64
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -220,7 +220,7 @@ class PageRepo
/**
* Saves a page revision into the system.
*/
protected function savePageRevision(Page $page, string $summary = null)
protected function savePageRevision(Page $page, string $summary = null): PageRevision
{
$revision = new PageRevision($page->getAttributes());
@ -287,8 +287,6 @@ class PageRepo
{
$page->revision_count++;
$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);
@ -296,8 +294,11 @@ class PageRepo
$page->updated_by = user()->id;
$page->refreshSlug();
$page->save();
$page->indexForSearch();
$summary = trans('entities.pages_revision_restored_from', ['id' => strval($revisionId), 'summary' => $revision->summary]);
$this->savePageRevision($page, $summary);
Activity::addForEntity($page, ActivityType::PAGE_RESTORE);
return $page;
}