From 693d25233b89f60cef1a865955af6f4222ebc5f0 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 | 24 ++++++------- Admin/Routes/Web/Api.php | 39 ++++++++++++++++++++++ Controller/ApiController.php | 6 ++-- Controller/ApiEquipmentTypeController.php | 12 +++---- Controller/ApiInspectionTypeController.php | 12 +++---- Theme/Backend/equipment-view.tpl.php | 8 ++--- 6 files changed, 70 insertions(+), 31 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 65ff5fc..5037622 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -103,7 +103,7 @@ final class Installer extends InstallerAbstract $request->header->account = 1; $request->setData('name', $type['name'] ?? ''); - $request->setData('title', \reset($type['l11n'])); + $request->setData('content', \reset($type['l11n'])); $request->setData('language', \array_keys($type['l11n'])[0] ?? 'en'); $module->apiEquipmentTypeCreate($request, $response); @@ -128,9 +128,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', $equipmentTypes[$type['name']]['id']); + $request->setData('ref', $equipmentTypes[$type['name']]['id']); $module->apiEquipmentTypeL11nCreate($request, $response); } @@ -164,7 +164,7 @@ final class Installer extends InstallerAbstract $request->header->account = 1; $request->setData('name', $type['name'] ?? ''); - $request->setData('title', \reset($type['l11n'])); + $request->setData('content', \reset($type['l11n'])); $request->setData('language', \array_keys($type['l11n'])[0] ?? 'en'); $module->apiInspectionTypeCreate($request, $response); @@ -189,9 +189,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', $inspectionTypes[$type['name']]['id']); + $request->setData('ref', $inspectionTypes[$type['name']]['id']); $module->apiInspectionTypeL11nCreate($request, $response); } @@ -225,7 +225,7 @@ final class Installer extends InstallerAbstract $request->header->account = 1; $request->setData('name', $attribute['name'] ?? ''); - $request->setData('title', \reset($attribute['l11n'])); + $request->setData('content', \reset($attribute['l11n'])); $request->setData('language', \array_keys($attribute['l11n'])[0] ?? 'en'); $request->setData('repeatable', $attribute['repeatable'] ?? false); $request->setData('internal', $attribute['internal'] ?? false); @@ -256,9 +256,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', $itemAttrType[$attribute['name']]['id']); + $request->setData('ref', $itemAttrType[$attribute['name']]['id']); $module->apiEquipmentAttributeTypeL11nCreate($request, $response); } @@ -305,7 +305,7 @@ final class Installer extends InstallerAbstract $request->setData('type', $itemAttrType[$attribute['name']]['id']); if (isset($value['l11n']) && !empty($value['l11n'])) { - $request->setData('title', \reset($value['l11n'])); + $request->setData('content', \reset($value['l11n'])); $request->setData('language', \array_keys($value['l11n'])[0] ?? 'en'); } @@ -333,9 +333,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('value', $attrValue['id']); + $request->setData('ref', $attrValue['id']); $module->apiEquipmentAttributeValueL11nCreate($request, $response); } diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 27ab83c..b5520d7 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -32,6 +32,45 @@ return [ ], ], + '^.*/equipment(\?.*|$)$' => [ + [ + 'dest' => '\Modules\EquipmentManagement\Controller\ApiController:apiEquipmentCreate', + 'verb' => RouteVerb::PUT, + 'csrf' => true, + 'active' => true, + 'permission' => [ + 'module' => Controller::NAME, + 'type' => PermissionType::CREATE, + 'state' => PermissionCategory::EQUIPMENT, + ], + ], + [ + 'dest' => '\Modules\EquipmentManagement\Controller\ApiController:apiEquipmentUpdate', + 'verb' => RouteVerb::SET, + 'csrf' => true, + 'active' => true, + 'permission' => [ + 'module' => Controller::NAME, + 'type' => PermissionType::MODIFY, + 'state' => PermissionCategory::EQUIPMENT, + ], + ], + ], + + '^.*/equipment/file(\?.*|$)$' => [ + [ + 'dest' => '\Modules\EquipmentManagement\Controller\ApiController:apiMediaAddToEquipment', + 'verb' => RouteVerb::PUT, + 'csrf' => true, + 'active' => true, + 'permission' => [ + 'module' => Controller::NAME, + 'type' => PermissionType::CREATE, + 'state' => PermissionCategory::EQUIPMENT, + ], + ], + ], + '^.*/equipment/attribute(\?.*$|$)' => [ [ 'dest' => '\Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController:apiEquipmentAttributeCreate', diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9151167..1f372d7 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -278,7 +278,7 @@ final class ApiController extends Controller return; } - $request->setData('virtualpath', '/Modules/EquipmentManagement/Equipment/' . $request->getData('id'), true); + $request->setData('virtualpath', '/Modules/EquipmentManagement/Equipment/' . $request->getData('ref'), true); $this->app->moduleManager->get('Editor', 'Api')->apiEditorCreate($request, $response, $data); if ($response->header->status !== RequestStatusCode::R_200) { @@ -291,7 +291,7 @@ final class ApiController extends Controller } $model = $responseData['response']; - $this->createModelRelation($request->header->account, (int) $request->getData('id'), $model->id, EquipmentMapper::class, 'notes', '', $request->getOrigin()); + $this->createModelRelation($request->header->account, (int) $request->getData('ref'), $model->id, EquipmentMapper::class, 'notes', '', $request->getOrigin()); } /** @@ -306,7 +306,7 @@ final class ApiController extends Controller private function validateNoteCreate(RequestAbstract $request) : array { $val = []; - if (($val['id'] = !$request->hasData('id')) + if (($val['ref'] = !$request->hasData('ref')) ) { return $val; } diff --git a/Controller/ApiEquipmentTypeController.php b/Controller/ApiEquipmentTypeController.php index 245a8b1..9ce93d6 100755 --- a/Controller/ApiEquipmentTypeController.php +++ b/Controller/ApiEquipmentTypeController.php @@ -74,7 +74,7 @@ final class ApiEquipmentTypeController extends Controller { $equipmentType = new BaseStringL11nType(); $equipmentType->setL11n( - $request->getDataString('title') ?? '', + $request->getDataString('content') ?? '', ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN ); $equipmentType->title = $request->getDataString('name') ?? ''; @@ -94,7 +94,7 @@ final class ApiEquipmentTypeController extends Controller private function validateEquipmentTypeCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = !$request->hasData('title')) + if (($val['content'] = !$request->hasData('content')) ) { return $val; } @@ -141,9 +141,9 @@ final class ApiEquipmentTypeController extends Controller private function createEquipmentTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n { $equipmentTypeL11n = new BaseStringL11n(); - $equipmentTypeL11n->ref = $request->getDataInt('type') ?? 0; + $equipmentTypeL11n->ref = $request->getDataInt('ref') ?? 0; $equipmentTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language; - $equipmentTypeL11n->content = $request->getDataString('title') ?? ''; + $equipmentTypeL11n->content = $request->getDataString('content') ?? ''; return $equipmentTypeL11n; } @@ -160,8 +160,8 @@ final class ApiEquipmentTypeController extends Controller private function validateEquipmentTypeL11nCreate(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/Controller/ApiInspectionTypeController.php b/Controller/ApiInspectionTypeController.php index 7997776..31a1b4b 100755 --- a/Controller/ApiInspectionTypeController.php +++ b/Controller/ApiInspectionTypeController.php @@ -148,7 +148,7 @@ final class ApiInspectionTypeController extends Controller { $equipmentType = new BaseStringL11nType(); $equipmentType->setL11n( - $request->getDataString('title') ?? '', + $request->getDataString('content') ?? '', ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN ); $equipmentType->title = $request->getDataString('name') ?? ''; @@ -168,7 +168,7 @@ final class ApiInspectionTypeController extends Controller private function validateInspectionTypeCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = !$request->hasData('title')) + if (($val['content'] = !$request->hasData('content')) ) { return $val; } @@ -215,9 +215,9 @@ final class ApiInspectionTypeController extends Controller private function createInspectionTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n { $equipmentTypeL11n = new BaseStringL11n(); - $equipmentTypeL11n->ref = $request->getDataInt('type') ?? 0; + $equipmentTypeL11n->ref = $request->getDataInt('ref') ?? 0; $equipmentTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language; - $equipmentTypeL11n->content = $request->getDataString('title') ?? ''; + $equipmentTypeL11n->content = $request->getDataString('content') ?? ''; return $equipmentTypeL11n; } @@ -234,8 +234,8 @@ final class ApiInspectionTypeController extends Controller private function validateInspectionTypeL11nCreate(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/equipment-view.tpl.php b/Theme/Backend/equipment-view.tpl.php index bc76e06..0b40d7b 100755 --- a/Theme/Backend/equipment-view.tpl.php +++ b/Theme/Backend/equipment-view.tpl.php @@ -154,7 +154,7 @@ echo $this->data['nav']->render(); $equipment->attributes, $this->data['attributeTypes'] ?? [], $this->data['units'] ?? [], - '{/api}fleet/equipment/attribute?csrf={$CSRF}', + '{/api}equipment/attribute?csrf={$CSRF}', $equipment->id ); ?> @@ -163,18 +163,18 @@ echo $this->data['nav']->render(); request->uri->fragment === 'c-tab-3' ? ' checked' : ''; ?>>
- data['media-upload']->render('equipment-file', 'files', '', $equipment->files); ?> + data['media-upload']->render('equipment-file', 'files', '', $equipment->files, '{/api}equipment/file?csrf={$CSRF}', (string) $equipment->id); ?>
request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>>
- data['equipment-notes']->render('equipment-notes', '', $equipment->notes); ?> + data['equipment-notes']->render('equipment-notes', '', $equipment->notes, '{/api}equipment/note?csrf={$CSRF}', (string) $equipment->id); ?>
request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
- getHtml('Create', '0', '0'); ?> + getHtml('Create', '0', '0'); ?>