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

fix username rendering and recursive collection creation

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-11 23:23:03 +01:00
parent 5020f1bb2a
commit 619eb8aed1
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Controller/ApiController.php
View File

@ -118,7 +118,6 @@ final class ApiController extends Controller
);
$collection = null;
foreach ($uploaded as $media) {
MediaMapper::create()->execute($media);
TaskMapper::writer()->createRelationTable('media', [$media->getId()], $task->getId());
@ -131,12 +130,16 @@ final class ApiController extends Controller
ReferenceMapper::create()->execute($ref);
if ($collection === null) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$accountPath,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/Tasks/' . $task->createdAt->format('Y') . '/' . $task->createdAt->format('m') . '/' . $task->getId()
);
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection instanceof NullMedia) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$accountPath,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/Tasks/' . $task->createdAt->format('Y') . '/' . $task->createdAt->format('m') . '/' . $task->getId()
);
}
}
CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId());
@ -157,12 +160,16 @@ final class ApiController extends Controller
ReferenceMapper::create()->execute($ref);
if ($collection === null) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$path,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path
);
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection instanceof NullMedia) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$path,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path
);
}
}
CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId());