Jingga/oms-Support
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Support.git synced 2026-01-11 17:18:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes and template adjustments

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-07-31 17:20:49 +02:00
parent 0e2063e667
commit a0a523874b
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Controller/ApiController.php
View File

@ -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;
}

8
Models/TicketAttributeTypeL11n.php
View File

@ -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
*/

11
Models/TicketElement.php
View File

@ -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();

2
Theme/Backend/support-list.tpl.php
View File

@ -51,7 +51,7 @@ echo $this->getData('nav')->render(); ?>
<td><a class="content" href="<?= UriFactory::build('{/prefix}profile/single?for=' . $ticket->for->getId()); ?>"><?= $this->printHtml($ticket->for->name1); ?> <?= $this->printHtml($ticket->for->name2); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->task->createdAt->format('Y-m-d H:i')); ?></a>
<?php endforeach; if ($c == 0) : ?>
<tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<tr><td colspan="7" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
<?php endif; ?>
</table>
</section>

5
Theme/Backend/support-ticket.tpl.php
View File

@ -88,7 +88,7 @@ echo $this->getData('nav')->render(); ?>
<?php if (!empty($taskMedia)) : ?>
<div>
<?php foreach ($taskMedia as $media) : ?>
<span><?= $media->name; ?></span>
<span><a class="content" href="<?= UriFactory::build('{/prefix}media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
<?php endforeach; ?>
</div>
<?php endif; ?>
@ -236,7 +236,6 @@ echo $this->getData('nav')->render(); ?>
</div>
<?php endif; ?>
<?php $elementMedia = $element->getMedia();
if (!empty($elementMedia)
|| ($task->isEditable
@ -246,7 +245,7 @@ echo $this->getData('nav')->render(); ?>
<?php if (!empty($elementMedia)) : ?>
<div>
<?php foreach ($elementMedia as $media) : ?>
<span><?= $media->name; ?></span>
<span><a class="content" href="<?= UriFactory::build('{/prefix}media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
<?php endforeach; ?>
</div>
<?php endif; ?>

2
composer.json
View File

@ -10,7 +10,7 @@
"require-dev": {
"phpunit/phpunit": ">=9.4",
"friendsofphp/php-cs-fixer": ">=3.0",
"squizlabs/php_codesniffer": ">=3.5",
"squizlabs/php_codesniffer": ">=3.6",
"phpmd/phpmd": ">=2.9",
"phpstan/phpstan": ">=0.12.58",
"phan/phan": ">=3.2.6"