diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 3f63d53..089e5cd 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -253,8 +253,8 @@ final class ApiController extends Controller { $taskElement = $this->app->moduleManager->get('Tasks')->createTaskElementFromRequest($request, $ticket->task); - $ticketElement = new TicketElement($taskElement); - $ticketElement->time = (int) $request->getData('time') ?? 0; + $ticketElement = new TicketElement($taskElement); + $ticketElement->time = (int) $request->getData('time') ?? 0; $ticketElement->ticket = $ticket->getId(); return $ticketElement; @@ -313,11 +313,11 @@ final class ApiController extends Controller */ private function updateTicketElementFromRequest(RequestAbstract $request) : TicketElementMapper { - $element = TicketElementMapper::get((int) ($request->getData('id'))); - $element->taskElement->due = new \DateTime((string) ($request->getData('due') ?? $element->getDue()->format('Y-m-d H:i:s'))); - $element->taskElement->setStatus((int) ($request->getData('status') ?? $element->taskElement->getStatus())); + $element = TicketElementMapper::get((int) ($request->getData('id'))); + $element->taskElement->due = new \DateTime((string) ($request->getData('due') ?? $element->getDue()->format('Y-m-d H:i:s'))); $element->taskElement->description = Markdown::parse((string) ($request->getData('plain') ?? $element->taskElement->descriptionRaw)); $element->taskElement->descriptionRaw = (string) ($request->getData('plain') ?? $element->taskElement->descriptionRaw); + $element->taskElement->setStatus((int) ($request->getData('status') ?? $element->taskElement->getStatus())); $tos = $request->getData('to') ?? $request->header->account; if (!\is_array($tos)) { @@ -450,10 +450,10 @@ final class ApiController extends Controller */ private function createTicketAttributeFromRequest(RequestAbstract $request) : TicketAttribute { - $attribute = new TicketAttribute(); - $attribute->ticket = (int) $request->getData('ticket'); - $attribute->type = new NullTicketAttributeType((int) $request->getData('type')); - $attribute->value = new NullTicketAttributeValue((int) $request->getData('value')); + $attribute = new TicketAttribute(); + $attribute->ticket = (int) $request->getData('ticket'); + $attribute->type = new NullTicketAttributeType((int) $request->getData('type')); + $attribute->value = new NullTicketAttributeValue((int) $request->getData('value')); return $attribute; } diff --git a/Models/TicketAttributeTypeL11n.php b/Models/TicketAttributeTypeL11n.php index 453d942..f8ebc8e 100755 --- a/Models/TicketAttributeTypeL11n.php +++ b/Models/TicketAttributeTypeL11n.php @@ -41,9 +41,7 @@ class TicketAttributeTypeL11n implements \JsonSerializable, ArrayableInterface * @var int|TicketAttributeType * @since 1.0.0 */ - protected int | - -TicketAttributeType $type = 0; + protected int|TicketAttributeType $type = 0; /** * Language. @@ -65,8 +63,8 @@ TicketAttributeType $type = 0; * Constructor. * * @param int|TicketAttributeType $type Attribute type - * @param string $title Localized title - * @param string $language Language + * @param string $title Localized title + * @param string $language Language * * @since 1.0.0 */ diff --git a/Models/TicketElement.php b/Models/TicketElement.php index 3b3b0b8..1b43760 100644 --- a/Models/TicketElement.php +++ b/Models/TicketElement.php @@ -32,7 +32,7 @@ class TicketElement implements \JsonSerializable * @var int * @since 1.0.0 */ - private int $id = 0; + protected int $id = 0; /** * Ticket element time @@ -59,9 +59,12 @@ class TicketElement implements \JsonSerializable public TaskElement $taskElement; /** - * Constructor. - * @since 1.0.0 - */ + * Constructor. + * + * @param null|TaskElement $taskElement Task element + * + * @since 1.0.0 + */ public function __construct(TaskElement $taskElement = null) { $this->taskElement = $taskElement ?? new TaskElement(); @@ -94,4 +97,4 @@ class TicketElement implements \JsonSerializable { return $this->toArray(); } -} \ No newline at end of file +} diff --git a/Theme/Backend/support-list.tpl.php b/Theme/Backend/support-list.tpl.php index 72f93e7..76050af 100755 --- a/Theme/Backend/support-list.tpl.php +++ b/Theme/Backend/support-list.tpl.php @@ -51,7 +51,7 @@ echo $this->getData('nav')->render(); ?>