render fixes, minor bug fixes

This commit is contained in:
Dennis Eichhorn 2022-03-05 17:03:47 +01:00
parent 23c8ee9744
commit b9013307c5
2 changed files with 12 additions and 8 deletions

View File

@ -33,6 +33,7 @@ use Modules\Support\Models\TicketAttributeValueMapper;
use Modules\Support\Models\TicketElement;
use Modules\Support\Models\TicketElementMapper;
use Modules\Support\Models\TicketMapper;
use Modules\Tasks\Models\TaskMapper;
use Modules\Tasks\Models\TaskStatus;
use Modules\Tasks\Models\TaskType;
use phpOMS\Localization\ISO639x1Enum;
@ -228,14 +229,17 @@ final class ApiController extends Controller
return;
}
$ticket = TicketMapper::get()->where('id', (int) ($request->getData('ticket')))->execute();
$ticket = TicketMapper::get()->with('task')->where('id', (int) ($request->getData('ticket')))->execute();
$element = $this->createTicketElementFromRequest($request, $ticket);
$old = clone $ticket->task;
$ticket->task->setStatus($element->taskElement->getStatus());
$ticket->task->setPriority($element->taskElement->getPriority());
$ticket->task->due = $element->taskElement->due;
$this->createModel($request->header->account, $element, TicketElementMapper::class, 'ticketelement', $request->getOrigin());
$this->updateModel($request->header->account, $ticket, $ticket, TicketMapper::class, 'ticket', $request->getOrigin());
$this->updateModel($request->header->account, $old, $ticket->task, TaskMapper::class, 'ticket', $request->getOrigin());
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Ticket element', 'Ticket element successfully created.', $element);
}

View File

@ -15,11 +15,11 @@ declare(strict_types=1);
return ['Support' => [
'Account' => 'Account',
'All' => 'All',
'Assigned' => '',
'Assigned' => 'Assigned',
'AverageAmount' => 'Average Amount',
'AverageProcessTime' => 'Avg. Process Time',
'Closed' => '',
'Completion' => '',
'Closed' => 'Closed',
'Completion' => 'Completion',
'Created' => 'Created',
'Creator' => 'Creator',
'Day' => 'Day',
@ -27,7 +27,7 @@ return ['Support' => [
'Description' => 'Description',
'Due' => 'Due',
'Files' => 'Files',
'For' => '',
'For' => 'For',
'Forwarded' => 'Forwarded',
'From' => 'From',
'Group' => 'Group',
@ -58,8 +58,8 @@ return ['Support' => [
'Today' => 'Today',
'Topic' => 'Topic',
'Type' => 'Type',
'Unassigned' => '',
'Unsolved' => '',
'Unassigned' => 'Unassigned',
'Unsolved' => 'Unsolved',
'Upload' => 'Upload',
'Week' => 'Week',
'Year' => 'Year',