This commit is contained in:
Dennis Eichhorn 2023-09-10 18:58:34 +00:00
parent 3bbb1dd3ae
commit c01b4c051a
3 changed files with 8 additions and 8 deletions

View File

@ -112,7 +112,7 @@ final class Installer extends InstallerAbstract
/** @var \Modules\ItemManagement\Controller\ApiAttributeController $module2 */ /** @var \Modules\ItemManagement\Controller\ApiAttributeController $module2 */
$module2 = $app->moduleManager->getModuleInstance('ItemManagement', 'ApiAttribute'); $module2 = $app->moduleManager->getModuleInstance('ItemManagement', 'ApiAttribute');
/** @var \Modules\Attribute\Models\Attribute\AttributeType[] $attributeTypes */ /** @var \Modules\Attribute\Models\AttributeType[] $attributeTypes */
$attributeTypes = ItemAttributeTypeMapper::getAll()->with('defaults')->execute(); $attributeTypes = ItemAttributeTypeMapper::getAll()->with('defaults')->execute();
/** @var \phpOMS\Localization\BaseStringL11nType[] $l11nTypes */ /** @var \phpOMS\Localization\BaseStringL11nType[] $l11nTypes */

View File

@ -327,7 +327,7 @@ final class ApiAttributeController extends Controller
return; return;
} }
/** @var \Modules\ItemManagement\Models\ItemAttributeTypeL11n $itemAttributeTypeL11n */ /** @var BaseStringL11n $itemAttributeTypeL11n */
$itemAttributeTypeL11n = ItemAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $itemAttributeTypeL11n = ItemAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
$this->deleteModel($request->header->account, $itemAttributeTypeL11n, ItemAttributeTypeL11nMapper::class, 'item_attribute_type_l11n', $request->getOrigin()); $this->deleteModel($request->header->account, $itemAttributeTypeL11n, ItemAttributeTypeL11nMapper::class, 'item_attribute_type_l11n', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $itemAttributeTypeL11n); $this->createStandardDeleteResponse($request, $response, $itemAttributeTypeL11n);
@ -387,7 +387,7 @@ final class ApiAttributeController extends Controller
return; return;
} }
/** @var \Modules\ItemManagement\Models\ItemAttributeType $itemAttributeType */ /** @var AttributeType $itemAttributeType */
$itemAttributeType = ItemAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); $itemAttributeType = ItemAttributeTypeMapper::get()->where('id', (int) $request->getData('id'))->execute();
$this->deleteModel($request->header->account, $itemAttributeType, ItemAttributeTypeMapper::class, 'item_attribute_type', $request->getOrigin()); $this->deleteModel($request->header->account, $itemAttributeType, ItemAttributeTypeMapper::class, 'item_attribute_type', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $itemAttributeType); $this->createStandardDeleteResponse($request, $response, $itemAttributeType);
@ -418,7 +418,7 @@ final class ApiAttributeController extends Controller
/** @var AttributeValue $old */ /** @var AttributeValue $old */
$old = ItemAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = ItemAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute();
/** @var \Modules\Attribute\Models\Attribute $type */ /** @var \Modules\Attribute\Models\Attribute $attr */
$attr = ItemAttributeMapper::get() $attr = ItemAttributeMapper::get()
->with('type') ->with('type')
->where('id', $request->getDataInt('attribute') ?? 0) ->where('id', $request->getDataInt('attribute') ?? 0)
@ -514,7 +514,7 @@ final class ApiAttributeController extends Controller
return; return;
} }
/** @var \Modules\ItemManagement\Models\ItemAttributeValueL11n $itemAttributeValueL11n */ /** @var BaseStringL11n $itemAttributeValueL11n */
$itemAttributeValueL11n = ItemAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $itemAttributeValueL11n = ItemAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
$this->deleteModel($request->header->account, $itemAttributeValueL11n, ItemAttributeValueL11nMapper::class, 'item_attribute_value_l11n', $request->getOrigin()); $this->deleteModel($request->header->account, $itemAttributeValueL11n, ItemAttributeValueL11nMapper::class, 'item_attribute_value_l11n', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $itemAttributeValueL11n); $this->createStandardDeleteResponse($request, $response, $itemAttributeValueL11n);

View File

@ -374,8 +374,8 @@ final class ApiController extends Controller
public function apiItemL11nUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiItemL11nUpdate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
if (!empty($val = $this->validateItemL11nUpdate($request))) { if (!empty($val = $this->validateItemL11nUpdate($request))) {
$response->data['l11n_update'] = new FormValidation($val); $response->data['l11n_update'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
return; return;
} }
@ -401,7 +401,7 @@ final class ApiController extends Controller
*/ */
private function updateItemL11nFromRequest(RequestAbstract $request, BaseStringL11n $l11n) : BaseStringL11n private function updateItemL11nFromRequest(RequestAbstract $request, BaseStringL11n $l11n) : BaseStringL11n
{ {
$l11n->content = $request->getDataString('description'); $l11n->content = $request->getDataString('description') ?? '';
return $l11n; return $l11n;
} }