Jingga/oms-Attribute
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Attribute.git synced 2026-01-26 23:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
Details
CI / general_module_workflow_php (push) Has been cancelled
Details
CI / general_module_workflow_js (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-10-11 19:17:39 +00:00
parent 4a316fa7d9
commit ccf4ede6f5
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Controller/ApiAttributeTraitController.php
View File

@ -111,9 +111,9 @@ trait ApiAttributeTraitController
private function createAttributeTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('type') ?? 0;
$attrL11n->ref = $request->getDataInt('ref') ?? 0;
$attrL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$attrL11n->content = $request->getDataString('title') ?? '';
$attrL11n->content = $request->getDataString('content') ?? '';
return $attrL11n;
}
@ -130,8 +130,8 @@ trait ApiAttributeTraitController
private function validateAttributeTypeL11nCreate(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;
}
@ -158,7 +158,7 @@ trait ApiAttributeTraitController
$attrType->isRequired = $request->getDataBool('is_required') ?? false;
$attrType->validationPattern = $request->getDataString('validation_pattern') ?? '';
$attrType->setL11n(
$request->getDataString('title') ?? '',
$request->getDataString('content') ?? '',
ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
);
$attrType->setFields($request->getDataInt('fields') ?? 0);
@ -178,7 +178,7 @@ trait ApiAttributeTraitController
private function validateAttributeTypeCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = !$request->hasData('title'))
if (($val['content'] = !$request->hasData('content'))
|| ($val['name'] = !$request->hasData('name'))
) {
return $val;
@ -203,9 +203,9 @@ trait ApiAttributeTraitController
$attrValue->unit = $request->getDataString('unit') ?? '';
$attrValue->setValue($request->getDataString('value'), $type->datatype);
if ($request->hasData('title')) {
if ($request->hasData('content')) {
$attrValue->setL11n(
$request->getDataString('title') ?? '',
$request->getDataString('content') ?? '',
ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
);
}
@ -246,9 +246,9 @@ trait ApiAttributeTraitController
private function createAttributeValueL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('value') ?? 0;
$attrL11n->ref = $request->getDataInt('ref') ?? 0;
$attrL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$attrL11n->content = $request->getDataString('title') ?? '';
$attrL11n->content = $request->getDataString('content') ?? '';
return $attrL11n;
}
@ -265,8 +265,8 @@ trait ApiAttributeTraitController
private function validateAttributeValueL11nCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = !$request->hasData('title'))
|| ($val['value'] = !$request->hasData('value'))
if (($val['content'] = !$request->hasData('content'))
|| ($val['ref'] = !$request->hasData('ref'))
) {
return $val;
}

24
Controller/ApiController.php
View File

@ -176,9 +176,9 @@ final class ApiController extends Controller
private function createAttributeTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('type') ?? 0;
$attrL11n->ref = $request->getDataInt('ref') ?? 0;
$attrL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$attrL11n->content = $request->getDataString('title') ?? '';
$attrL11n->content = $request->getDataString('content') ?? '';
return $attrL11n;
}
@ -195,8 +195,8 @@ final class ApiController extends Controller
private function validateAttributeTypeL11nCreate(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;
}
@ -249,7 +249,7 @@ final class ApiController extends Controller
$attrType->isRepeatable = $request->getDataBool('is_repeatable') ?? false;
$attrType->validationPattern = $request->getDataString('validation_pattern') ?? '';
$attrType->setL11n(
$request->getDataString('title') ?? '',
$request->getDataString('content') ?? '',
ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
);
$attrType->setFields($request->getDataInt('fields') ?? 0);
@ -269,7 +269,7 @@ final class ApiController extends Controller
private function validateAttributeTypeCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = !$request->hasData('title'))
if (($val['content'] = !$request->hasData('content'))
|| ($val['name'] = !$request->hasData('name'))
) {
return $val;
@ -335,9 +335,9 @@ final class ApiController extends Controller
$attrValue->isDefault = $request->getDataBool('default') ?? false;
$attrValue->setValue($request->getData('value'), $type->datatype);
if ($request->hasData('title')) {
if ($request->hasData('content')) {
$attrValue->setL11n(
$request->getDataString('title') ?? '',
$request->getDataString('content') ?? '',
ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
);
}
@ -405,9 +405,9 @@ final class ApiController extends Controller
private function createAttributeValueL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('value') ?? 0;
$attrL11n->ref = $request->getDataInt('ref') ?? 0;
$attrL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$attrL11n->content = $request->getDataString('title') ?? '';
$attrL11n->content = $request->getDataString('content') ?? '';
return $attrL11n;
}
@ -424,8 +424,8 @@ final class ApiController extends Controller
private function validateAttributeValueL11nCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = !$request->hasData('title'))
|| ($val['value'] = !$request->hasData('value'))
if (($val['content'] = !$request->hasData('content'))
|| ($val['ref'] = !$request->hasData('ref'))
) {
return $val;
}