bug fixes / dbmapper fixes

This commit is contained in:
Dennis Eichhorn 2021-12-19 20:20:39 +01:00
parent 61693db2e6
commit 6c2f5dbb3e
3 changed files with 21 additions and 9 deletions

View File

@ -1,4 +1,16 @@
<?php declare(strict_types=1); <?php
/**
* Orange Management
*
* PHP Version 8.0
*
* @package Template
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link https://orange-management.org
*/
declare(strict_types=1);
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;

View File

@ -307,16 +307,16 @@ final class ApiController extends Controller
* *
* @param RequestAbstract $request Request * @param RequestAbstract $request Request
* *
* @return TicketElementMapper Returns the updated ticket element from the request * @return TicketElement Returns the updated ticket element from the request
* *
* @since 1.0.0 * @since 1.0.0
*/ */
private function updateTicketElementFromRequest(RequestAbstract $request, ResponseAbstract $response) : TicketElementMapper private function updateTicketElementFromRequest(RequestAbstract $request, ResponseAbstract $response) : TicketElement
{ {
/** @var TicketElementMapper $element */ /** @var TicketElement $element */
$element = TicketElementMapper::get()->where('id', (int) ($request->getData('id')))->execute(); $element = TicketElementMapper::get()->with('taskElement')->where('id', (int) ($request->getData('id')))->execute();
$request->setData('id', $element->task, true); $request->setData('id', $element->taskElement->task, true);
$this->app->moduleManager->get('Tasks')->apiTaskElementSet($request, $response); $this->app->moduleManager->get('Tasks')->apiTaskElementSet($request, $response);
return $element; return $element;
@ -570,7 +570,7 @@ final class ApiController extends Controller
*/ */
private function createTicketAttributeTypeFromRequest(RequestAbstract $request) : TicketAttributeType private function createTicketAttributeTypeFromRequest(RequestAbstract $request) : TicketAttributeType
{ {
$attrType = new TicketAttributeType(); $attrType = new TicketAttributeType();
$attrType->setL11n((string) ($request->getData('title') ?? ''), $request->getData('language') ?? ISO639x1Enum::_EN); $attrType->setL11n((string) ($request->getData('title') ?? ''), $request->getData('language') ?? ISO639x1Enum::_EN);
$attrType->fields = (int) ($request->getData('fields') ?? 0); $attrType->fields = (int) ($request->getData('fields') ?? 0);
$attrType->custom = (bool) ($request->getData('custom') ?? false); $attrType->custom = (bool) ($request->getData('custom') ?? false);

View File

@ -8,7 +8,7 @@
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
* @license OMS License 1.0 * @license OMS License 1.0
* @version 1.0.0 * @version 1.0.0
* @link https: //orange-management.org * @link https://orange-management.org
*/ */
declare(strict_types=1); declare(strict_types=1);
@ -21,7 +21,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
* *
* @package Modules\Support\Models * @package Modules\Support\Models
* @license OMS License 1.0 * @license OMS License 1.0
* @link https: //orange-management.org * @link https://orange-management.org
* @since 1.0.0 * @since 1.0.0
*/ */
final class TicketAttributeValueMapper extends DataMapperFactory final class TicketAttributeValueMapper extends DataMapperFactory