Jingga/oms-Editor
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Editor.git synced 2026-02-15 17:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-25 17:11:56 +00:00
parent cd5cbc84ec
commit f72c717907
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Controller/ApiController.php
View File

@ -235,8 +235,7 @@ final class ApiController extends Controller
{ {
/** @var \Modules\Editor\Models\EditorDoc $old */ /** @var \Modules\Editor\Models\EditorDoc $old */
$old = EditorDocMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = EditorDocMapper::get()->where('id', (int) $request->getData('id'))->execute();
$old = clone $old; $new = $this->updateEditorFromRequest($request, clone $old);
$new = $this->updateEditorFromRequest($request);
$this->updateModel($request->header->account, $old, $new, EditorDocMapper::class, 'doc', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, EditorDocMapper::class, 'doc', $request->getOrigin());
if ($new->isVersioned if ($new->isVersioned
@ -255,15 +254,14 @@ final class ApiController extends Controller
* Method to update document from request. * Method to update document from request.
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* @param EditorDoc $doc Doc
* *
* @return EditorDoc * @return EditorDoc
* *
* @since 1.0.0 * @since 1.0.0
*/ */
private function updateEditorFromRequest(RequestAbstract $request) : EditorDoc private function updateEditorFromRequest(RequestAbstract $request, EditorDoc $doc) : EditorDoc
{ {
/** @var \Modules\Editor\Models\EditorDoc $doc */
$doc = EditorDocMapper::get()->where('id', (int) $request->getData('id'))->execute();
$doc->isVersioned = $request->getDataBool('versioned') ?? $doc->isVersioned; $doc->isVersioned = $request->getDataBool('versioned') ?? $doc->isVersioned;
$doc->title = $request->getDataString('title') ?? $doc->title; $doc->title = $request->getDataString('title') ?? $doc->title;
$doc->plain = $request->getDataString('plain') ?? $doc->plain; $doc->plain = $request->getDataString('plain') ?? $doc->plain;
@ -289,7 +287,10 @@ final class ApiController extends Controller
public function apiEditorGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiEditorGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
/** @var \Modules\Editor\Models\EditorDoc $doc */ /** @var \Modules\Editor\Models\EditorDoc $doc */
$doc = EditorDocMapper::get()->where('id', (int) $request->getData('id'))->execute(); $doc = EditorDocMapper::get()
->where('id', (int) $request->getData('id'))
->execute();
$this->createStandardReturnResponse($request, $response, $doc); $this->createStandardReturnResponse($request, $response, $doc);
} }