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

update

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-09-10 18:58:34 +00:00
parent 2d4b96cf9f
commit 5fed6a6a0e
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Controller/ApiAttributeTraitController.php
View File

@ -17,13 +17,20 @@ namespace Modules\Attribute\Controller;
use Modules\Attribute\Models\Attribute;
use Modules\Attribute\Models\AttributeType;
use Modules\Attribute\Models\AttributeValue;
use Modules\Attribute\Models\NullAttribute;
use Modules\Attribute\Models\NullAttributeType;
use Modules\Attribute\Models\NullAttributeValue;
use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Message\RequestAbstract;
/**
* General attribute api functionality.
*
* @package Modules\Attribute
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
trait ApiAttributeTraitController
{
/**
@ -174,6 +181,7 @@ trait ApiAttributeTraitController
{
$attrValue = new AttributeValue();
$attrValue->isDefault = $request->getDataBool('default') ?? false;
$attrValue->unit = $request->getDataString('unit') ?? '';
$attrValue->setValue($request->getDataString('value'), $type->datatype);
if ($request->hasData('title')) {
@ -258,8 +266,14 @@ trait ApiAttributeTraitController
*/
public function updateAttributeFromRequest(RequestAbstract $request, Attribute $new) : Attribute
{
if ($request->hasData('value')) {
$new->value = $request->hasData('value') ? new NullAttributeValue((int) $request->getData('value')) : $new->value;
if ($new->type->custom) {
if ($request->hasData('value')) {
$new->value = new NullAttributeValue((int) $request->getData('value'));
} else {
// @todo: consider to check if custom value already exist and just reference the id? Problematic if content of id gets changed.
$new->value = new AttributeValue();
$new->value->setValue($request->getData('custom'), $new->type->datatype);
}
} else {
// @todo: fix by only accepting the value id to be used
// this is a workaround for now because the front end doesn't allow to dynamically show default values.
@ -267,7 +281,7 @@ trait ApiAttributeTraitController
// Couldn't find matching default value
if ($value->id === 0) {
return new NullAttribute();
return $new;
}
$new->value = $value;

8
Controller/ApiLocalizationTraitController.php
View File

@ -19,6 +19,14 @@ use phpOMS\Localization\BaseStringL11nType;
use phpOMS\Localization\NullBaseStringL11nType;
use phpOMS\Message\RequestAbstract;
/**
* General localization api functionality.
*
* @package Modules\Attribute
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
trait ApiLocalizationTraitController
{
/**