mirror of
https://github.com/Karaka-Management/oms-Comments.git
synced 2026-02-14 16:28:42 +00:00
many small fixes
This commit is contained in:
parent
cbab493e9a
commit
6782ea2689
|
|
@ -189,10 +189,20 @@ final class ApiController extends Controller
|
||||||
$collection = null;
|
$collection = null;
|
||||||
|
|
||||||
foreach ($uploaded as $media) {
|
foreach ($uploaded as $media) {
|
||||||
MediaMapper::create()->execute($media);
|
$this->createModelRelation(
|
||||||
CommentMapper::writer()->createRelationTable('media', [$media->getId()], $comment->getId());
|
$request->header->account,
|
||||||
|
$comment->getId(),
|
||||||
|
$media->getId(),
|
||||||
|
CommentMapper::class,
|
||||||
|
'media',
|
||||||
|
'',
|
||||||
|
$request->getOrigin()
|
||||||
|
);
|
||||||
|
|
||||||
$accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login . '/Comments/' . $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m') . '/' . $comment->getId();
|
$accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login
|
||||||
|
. '/Comments/'
|
||||||
|
. $comment->createdAt->format('Y') . '/' . $comment->createdAt->format('m')
|
||||||
|
. '/' . $comment->getId();
|
||||||
|
|
||||||
$ref = new Reference();
|
$ref = new Reference();
|
||||||
$ref->name = $media->name;
|
$ref->name = $media->name;
|
||||||
|
|
@ -200,7 +210,7 @@ final class ApiController extends Controller
|
||||||
$ref->createdBy = new NullAccount($request->header->account);
|
$ref->createdBy = new NullAccount($request->header->account);
|
||||||
$ref->setVirtualPath($accountPath);
|
$ref->setVirtualPath($accountPath);
|
||||||
|
|
||||||
ReferenceMapper::create()->execute($ref);
|
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
|
||||||
|
|
||||||
if ($collection === null) {
|
if ($collection === null) {
|
||||||
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
||||||
|
|
@ -210,7 +220,15 @@ final class ApiController extends Controller
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId());
|
$this->createModelRelation(
|
||||||
|
$request->header->account,
|
||||||
|
$collection->getId(),
|
||||||
|
$ref->getId(),
|
||||||
|
CollectionMapper::class,
|
||||||
|
'sources',
|
||||||
|
'',
|
||||||
|
$request->getOrigin()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -220,7 +238,15 @@ final class ApiController extends Controller
|
||||||
foreach ($mediaFiles as $file) {
|
foreach ($mediaFiles as $file) {
|
||||||
/** @var \Modules\Media\Models\Media $media */
|
/** @var \Modules\Media\Models\Media $media */
|
||||||
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
|
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
|
||||||
CommentMapper::writer()->createRelationTable('media', [$media->getId()], $comment->getId());
|
$this->createModelRelation(
|
||||||
|
$request->header->account,
|
||||||
|
$comment->getId(),
|
||||||
|
$media->getId(),
|
||||||
|
CommentMapper::class,
|
||||||
|
'media',
|
||||||
|
'',
|
||||||
|
$request->getOrigin()
|
||||||
|
);
|
||||||
|
|
||||||
$ref = new Reference();
|
$ref = new Reference();
|
||||||
$ref->name = $media->name;
|
$ref->name = $media->name;
|
||||||
|
|
@ -228,7 +254,7 @@ final class ApiController extends Controller
|
||||||
$ref->createdBy = new NullAccount($request->header->account);
|
$ref->createdBy = new NullAccount($request->header->account);
|
||||||
$ref->setVirtualPath($path);
|
$ref->setVirtualPath($path);
|
||||||
|
|
||||||
ReferenceMapper::create()->execute($ref);
|
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
|
||||||
|
|
||||||
if ($collection === null) {
|
if ($collection === null) {
|
||||||
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
|
||||||
|
|
@ -238,7 +264,15 @@ final class ApiController extends Controller
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId());
|
$this->createModelRelation(
|
||||||
|
$request->header->account,
|
||||||
|
$collection->getId(),
|
||||||
|
$ref->getId(),
|
||||||
|
CollectionMapper::class,
|
||||||
|
'sources',
|
||||||
|
'',
|
||||||
|
$request->getOrigin()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Karaka
|
|
||||||
*
|
|
||||||
* PHP Version 8.1
|
|
||||||
*
|
|
||||||
* @package Modules\Comments
|
|
||||||
* @copyright Dennis Eichhorn
|
|
||||||
* @license OMS License 1.0
|
|
||||||
* @version 1.0.0
|
|
||||||
* @link https://jingga.app
|
|
||||||
*/
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
return ['Comments' => [
|
|
||||||
]];
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Karaka
|
|
||||||
*
|
|
||||||
* PHP Version 8.1
|
|
||||||
*
|
|
||||||
* @package Modules\Comments
|
|
||||||
* @copyright Dennis Eichhorn
|
|
||||||
* @license OMS License 1.0
|
|
||||||
* @version 1.0.0
|
|
||||||
* @link https://jingga.app
|
|
||||||
*/
|
|
||||||
declare(strict_types=1);
|
|
||||||
|
|
||||||
return ['Comments' => [
|
|
||||||
]];
|
|
||||||
Loading…
Reference in New Issue
Block a user