diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 24c56ea..c7b7f4b 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -124,6 +124,7 @@ final class ApiController extends Controller TaskMapper::writer()->createRelationTable('media', [$media->getId()], $task->getId()); $ref = new Reference(); + $ref->name = $media->name; $ref->source = new NullMedia($media->getId()); $ref->createdBy = new NullAccount($request->header->account); $ref->setVirtualPath($accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login . '/Tasks/' . $task->createdAt->format('Y') . '/' . $task->createdAt->format('m') . '/' . $task->getId()); @@ -150,11 +151,14 @@ final class ApiController extends Controller if (!empty($mediaFiles = $request->getDataJson('media') ?? [])) { $collection = null; - foreach ($mediaFiles as $media) { - TaskMapper::writer()->createRelationTable('media', [(int) $media], $task->getId()); + foreach ($mediaFiles as $file) { + $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute(); + + TaskMapper::writer()->createRelationTable('media', [$media->getId()], $task->getId()); $ref = new Reference(); - $ref->source = new NullMedia((int) $media); + $ref->name = $media->name; + $ref->source = new NullMedia($media->getId()); $ref->createdBy = new NullAccount($request->header->account); $ref->setVirtualPath($path); @@ -401,6 +405,7 @@ final class ApiController extends Controller TaskElementMapper::writer()->createRelationTable('media', [$media->getId()], $element->getId()); $ref = new Reference(); + $ref->name = $media->name; $ref->source = new NullMedia($media->getId()); $ref->createdBy = new NullAccount($request->header->account); $ref->setVirtualPath($accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login . '/Tasks/' . $task->createdAt->format('Y') . '/' . $task->createdAt->format('m') . '/' . $task->getId()); @@ -423,11 +428,14 @@ final class ApiController extends Controller if (!empty($mediaFiles = $request->getDataJson('media') ?? [])) { $collection = null; - foreach ($mediaFiles as $media) { - TaskElementMapper::writer()->createRelationTable('media', [(int) $media], $element->getId()); + foreach ($mediaFiles as $file) { + $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute(); + + TaskElementMapper::writer()->createRelationTable('media', [$media->getId()], $element->getId()); $ref = new Reference(); - $ref->source = new NullMedia((int) $media); + $ref->name = $media->name; + $ref->source = new NullMedia($media->getId()); $ref->createdBy = new NullAccount($request->header->account); $ref->setVirtualPath($path); diff --git a/Theme/Backend/dashboard-task.tpl.php b/Theme/Backend/dashboard-task.tpl.php index 261880f..8584271 100755 --- a/Theme/Backend/dashboard-task.tpl.php +++ b/Theme/Backend/dashboard-task.tpl.php @@ -22,6 +22,7 @@ $tasksList = $this->getData('tasks') ?? [];
getHtml('Tasks', 'Tasks'); ?>
+
getHtml('Status', 'Tasks'); ?> @@ -55,6 +56,7 @@ $tasksList = $this->getData('tasks') ?? [];
getHtml('Empty', '0', '0'); ?>
+