diff --git a/Controller/ApiController.php b/Controller/ApiController.php index c27185c..15de9d5 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -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); } diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 3cb1ffe..9be5aff 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -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',