From ccd965f537ef94aee269558aa1b98560a55f2bec Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 11 Oct 2024 19:17:40 +0000 Subject: [PATCH] bug fixes --- Admin/Installer.php | 6 +++--- Controller/ApiController.php | 6 +++--- Controller/ApiDocTypeController.php | 12 ++++++------ Theme/Backend/Components/Note/BaseView.php | 6 ++++++ Theme/Backend/Components/Note/base.tpl.php | 6 +++++- Theme/Backend/editor-create.tpl.php | 4 ++++ tests/Controller/ApiControllerTest.php | 4 ++-- 7 files changed, 29 insertions(+), 15 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 32dc8d6..87bab9f 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -139,7 +139,7 @@ final class Installer extends InstallerAbstract $request->header->account = 1; $request->setData('name', $data['name'] ?? ''); - $request->setData('title', $data['name'] ?? ''); + $request->setData('content', $data['name'] ?? ''); $module->apiEditorDocTypeCreate($request, $response); @@ -163,9 +163,9 @@ final class Installer extends InstallerAbstract $request = new HttpRequest(); $request->header->account = 1; - $request->setData('title', $l11n); + $request->setData('content', $l11n); $request->setData('lang', $lang); - $request->setData('type', $id); + $request->setData('ref', $id); $module->apiEditorDocTypeL11nCreate($request, $response); } diff --git a/Controller/ApiController.php b/Controller/ApiController.php index b5f4d7a..9c20671 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -364,11 +364,11 @@ final class ApiController extends Controller fileNames: $request->getDataList('filenames'), files: $request->files, account: $request->header->account, - basePath: __DIR__ . '/../../../Modules/Media/Files/Modules/Editor/' . ($request->getData('doc') ?? '0'), + basePath: __DIR__ . '/../../../Modules/Media/Files/Modules/Editor/' . ($request->getData('ref') ?? '0'), virtualPath: '/Modules/Editor/' . ($request->getData('doc') ?? '0'), pathSettings: PathSettings::FILE_PATH, tag: $request->getDataInt('tag'), - rel: (int) $request->getDataInt('doc'), + rel: (int) $request->getDataInt('ref'), mapper: EditorDocMapper::class, field: 'files' ); @@ -394,7 +394,7 @@ final class ApiController extends Controller private function validateEditorFileCreate(RequestAbstract $request) : array { $val = []; - if (($val['doc'] = !$request->hasData('doc'))) { + if (($val['ref'] = !$request->hasData('ref'))) { return $val; } diff --git a/Controller/ApiDocTypeController.php b/Controller/ApiDocTypeController.php index 86db981..ee3f3cb 100644 --- a/Controller/ApiDocTypeController.php +++ b/Controller/ApiDocTypeController.php @@ -74,7 +74,7 @@ final class ApiDocTypeController extends Controller { $contractType = new BaseStringL11nType(); $contractType->setL11n( - $request->getDataString('title') ?? '', + $request->getDataString('content') ?? '', ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN ); $contractType->title = $request->getDataString('name') ?? ''; @@ -94,7 +94,7 @@ final class ApiDocTypeController extends Controller private function validateEditorDocTypeCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = !$request->hasData('title')) + if (($val['content'] = !$request->hasData('content')) ) { return $val; } @@ -141,9 +141,9 @@ final class ApiDocTypeController extends Controller private function createEditorDocTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n { $contractTypeL11n = new BaseStringL11n(); - $contractTypeL11n->ref = $request->getDataInt('type') ?? 0; + $contractTypeL11n->ref = $request->getDataInt('ref') ?? 0; $contractTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language; - $contractTypeL11n->content = $request->getDataString('title') ?? ''; + $contractTypeL11n->content = $request->getDataString('content') ?? ''; return $contractTypeL11n; } @@ -160,8 +160,8 @@ final class ApiDocTypeController extends Controller private function validateEditorDocTypeL11nCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = !$request->hasData('title')) - || ($val['type'] = !$request->hasData('type')) + if (($val['content'] = !$request->hasData('content')) + || ($val['ref'] = !$request->hasData('ref')) ) { return $val; } diff --git a/Theme/Backend/Components/Note/BaseView.php b/Theme/Backend/Components/Note/BaseView.php index 1cbf845..807edbd 100644 --- a/Theme/Backend/Components/Note/BaseView.php +++ b/Theme/Backend/Components/Note/BaseView.php @@ -62,6 +62,10 @@ class BaseView extends View */ public array $docs = []; + public string $ref = ''; + + public string $apiUri = ''; + /** * {@inheritdoc} */ @@ -80,6 +84,8 @@ class BaseView extends View $this->form = $data[0]; $this->name = $data[1] ?? 'UNDEFINED'; $this->docs = $data[2] ?? $this->docs; + $this->apiUri = $data[3] ?? ''; + $this->ref = $data[4] ?? ''; return parent::render(); } diff --git a/Theme/Backend/Components/Note/base.tpl.php b/Theme/Backend/Components/Note/base.tpl.php index cb3e4ce..d7bcc63 100644 --- a/Theme/Backend/Components/Note/base.tpl.php +++ b/Theme/Backend/Components/Note/base.tpl.php @@ -19,7 +19,7 @@ use phpOMS\Uri\UriFactory;
getHtml('Note', 'Editor', 'Backend'); ?>
-
+
@@ -31,6 +31,10 @@ use phpOMS\Uri\UriFactory; 
printHtml(''); ?>
+
+ + +
diff --git a/Theme/Backend/editor-create.tpl.php b/Theme/Backend/editor-create.tpl.php index 10735e3..fc58549 100755 --- a/Theme/Backend/editor-create.tpl.php +++ b/Theme/Backend/editor-create.tpl.php @@ -57,6 +57,7 @@ echo $this->data['nav']->render(); ?>
+ diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 673236b..c961caa 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -133,7 +133,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request = new HttpRequest(); $request->header->account = 1; - $request->setData('doc', '1'); + $request->setData('ref', '1'); $request->setData('name', 'NewUpload'); if (!\is_file(__DIR__ . '/test_tmp.md')) { @@ -163,7 +163,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $request = new HttpRequest(); $request->header->account = 1; - $request->setData('doc', '1'); + $request->setData('ref', '1'); $request->setData('name', 'MissingFile'); $this->module->apiFileCreate($request, $response);