From 9c3e50d46e7944034373d0c69d6b7e2ba31e0b3c 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/ApiClockingTypeController.php | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 1074470..29de8be 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -85,7 +85,7 @@ final class Installer extends InstallerAbstract $request->header->account = 1; $request->setData('name', $type['name'] ?? ''); $request->setData('is_work', $type['is_work'] ?? false); - $request->setData('title', \reset($type['l11n'])); + $request->setData('content', \reset($type['l11n'])); $request->setData('language', \array_keys($type['l11n'])[0] ?? 'en'); $module->apiClockingTypeCreate($request, $response); @@ -112,9 +112,9 @@ final class Installer extends InstallerAbstract $request = new HttpRequest(); $request->header->account = 1; - $request->setData('title', $l11n); + $request->setData('content', $l11n); $request->setData('language', $language); - $request->setData('type', $billType['id']); + $request->setData('ref', $billType['id']); $module->apiClockingTypeL11nCreate($request, $response); } diff --git a/Controller/ApiClockingTypeController.php b/Controller/ApiClockingTypeController.php index 7285742..0a489d8 100644 --- a/Controller/ApiClockingTypeController.php +++ b/Controller/ApiClockingTypeController.php @@ -78,7 +78,7 @@ final class ApiClockingTypeController extends Controller $clockingType->customPastTimeAllowed = $request->getDataBool('custom_past_time_allowed') ?? false; $clockingType->correctionAllowed = $request->getDataBool('correction_allowed') ?? false; $clockingType->setL11n( - $request->getDataString('title') ?? '', + $request->getDataString('content') ?? '', ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN ); @@ -97,7 +97,7 @@ final class ApiClockingTypeController extends Controller private function validateClockingTypeCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = !$request->hasData('title')) + if (($val['content'] = !$request->hasData('content')) || ($val['name'] = !$request->hasData('name')) ) { return $val; @@ -145,9 +145,9 @@ final class ApiClockingTypeController extends Controller private function createClockingTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n { $clockingTypeL11n = new BaseStringL11n(); - $clockingTypeL11n->ref = $request->getDataInt('type') ?? 0; + $clockingTypeL11n->ref = $request->getDataInt('ref') ?? 0; $clockingTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language; - $clockingTypeL11n->content = $request->getDataString('title') ?? ''; + $clockingTypeL11n->content = $request->getDataString('content') ?? ''; return $clockingTypeL11n; } @@ -164,8 +164,8 @@ final class ApiClockingTypeController extends Controller private function validateClockingTypeL11nCreate(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; } @@ -330,9 +330,9 @@ final class ApiClockingTypeController extends Controller */ public function updateClockingTypeL11nFromRequest(RequestAbstract $request, BaseStringL11n $new) : BaseStringL11n { - $new->ref = $request->getDataInt('type') ?? $new->ref; + $new->ref = $request->getDataInt('ref') ?? $new->ref; $new->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $new->language; - $new->content = $request->getDataString('title') ?? $new->content; + $new->content = $request->getDataString('content') ?? $new->content; return $new; }