webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

Pages: Updated editor field to always be set

Browse Source 
- Migration for setting on existing pages
- Added test to cover simple new page scenario

For #5117
This commit is contained in:
Dan Brown
2024-09-29 14:36:41 +01:00
parent 6103a22feb
commit 89f84c9a95
3 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@ use BookStack\Entities\Models\PageRevision;
use BookStack\Entities\Queries\EntityQueries;
use BookStack\Entities\Tools\BookContents;
use BookStack\Entities\Tools\PageContent;
use BookStack\Entities\Tools\PageEditorData;
use BookStack\Entities\Tools\PageEditorType;
use BookStack\Entities\Tools\TrashCan;
use BookStack\Exceptions\MoveOperationException;
@@ -44,6 +43,7 @@ class PageRepo
'owned_by' => user()->id,
'updated_by' => user()->id,
'draft' => true,
'editor' => PageEditorType::getSystemDefault()->value,
]);
if ($parent instanceof Chapter) {
@@ -146,8 +146,10 @@ class PageRepo
$pageContent->setNewHTML($input['html'], user());
}
if ($newEditor !== $currentEditor && userCan('editor-change')) {
if (($newEditor !== $currentEditor || empty($page->editor)) && userCan('editor-change')) {
$page->editor = $newEditor->value;
} elseif (empty($page->editor)) {
$page->editor = $defaultEditor->value;
}
}