archive/BookStackApp_BookStack
0
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-30 14:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Fixed markdown content on revision restore

Browse source 
Closes
This commit is contained in:
Dan Brown 2021-02-06 14:14:38 +00:00
parent 37de4e2e0a
commit a7e3c26fe3
No known key found for this signature in database
GPG key ID: 46D9F943C24A2EF9
2 changed files with 9 additions and 7 deletions
app/Entities/Repos
PageRepo.php
tests/Entity
PageRevisionTest.php

12
app/Entities/Repos/PageRepo.php
View file

@ -223,10 +223,6 @@ class PageRepo
{ {
$revision = new PageRevision($page->getAttributes()); $revision = new PageRevision($page->getAttributes());
if (setting('app-editor') !== 'markdown') {
$revision->markdown = '';
}
$revision->page_id = $page->id; $revision->page_id = $page->id;
$revision->slug = $page->slug; $revision->slug = $page->slug;
$revision->book_slug = $page->book->slug; $revision->book_slug = $page->book->slug;
@ -289,7 +285,13 @@ class PageRepo
$page->fill($revision->toArray()); $page->fill($revision->toArray());
$content = new PageContent($page); $content = new PageContent($page);
$content->setNewHTML($revision->html);
if (!empty($revision->markdown)) {
$content->setNewMarkdown($revision->markdown);
} else {
$content->setNewHTML($revision->html);
}
$page->updated_by = user()->id; $page->updated_by = user()->id;
$page->refreshSlug(); $page->refreshSlug();
$page->save(); $page->save();

4
tests/Entity/PageRevisionTest.php
View file

@ -74,7 +74,7 @@ class PageRevisionTest extends TestCase
$page = Page::first(); $page = Page::first();
$pageRepo->update($page, ['name' => 'updated page abc123', 'markdown' => '## New Content def456', 'summary' => 'initial page revision testing']); $pageRepo->update($page, ['name' => 'updated page abc123', 'markdown' => '## New Content def456', 'summary' => 'initial page revision testing']);
$pageRepo->update($page, ['name' => 'updated page again', 'markdown' => '## New Content Updated', 'summary' => 'page revision testing']); $pageRepo->update($page, ['name' => 'updated page again', 'markdown' => '## New Content Updated', 'summary' => 'page revision testing']);
$page = Page::find($page->id); $page = Page::find($page->id);
$pageView = $this->get($page->getUrl()); $pageView = $this->get($page->getUrl());
$pageView->assertDontSee('abc123'); $pageView->assertDontSee('abc123');
@ -90,7 +90,7 @@ class PageRevisionTest extends TestCase
$pageView = $this->get($page->getUrl()); $pageView = $this->get($page->getUrl());
$this->assertDatabaseHas('pages', [ $this->assertDatabaseHas('pages', [
'id' => $page->id, 'id' => $page->id,
'markdown' => '## New Content Updated', 'markdown' => '## New Content def456',
]); ]);
$pageView->assertSee('abc123'); $pageView->assertSee('abc123');
$pageView->assertSee('def456'); $pageView->assertSee('def456');