Jingga/oms-Editor
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Editor.git synced 2026-02-15 09:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

many small fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-02-10 18:20:57 +01:00
parent 3f3d0495fe
commit 781f547c96
4 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
Controller/ApiController.php
View File

@ -276,19 +276,11 @@ final class ApiController extends Controller
); );
$collection = null; $collection = null;
foreach ($uploaded as $media) { foreach ($uploaded as $media) {
MediaMapper::create()->execute($media); $accountPath = '/Accounts/' . $account->getId() . ' ' . $account->login
EditorDocMapper::writer()->createRelationTable('media', [$media->getId()], $doc->getId()); . '/Editor/'
. $doc->createdAt->format('Y') . '/' . $doc->createdAt->format('m')
$ref = new Reference(); . '/' . $doc->getId();
$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 . '/Editor/' . $doc->createdAt->format('Y') . '/' . $doc->createdAt->format('m') . '/' . $doc->getId());
ReferenceMapper::create()->execute($ref);
if ($collection === null) { if ($collection === null) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
@ -298,23 +290,39 @@ final class ApiController extends Controller
); );
} }
CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId()); $this->createModelRelation(
$request->header->account,
$doc->getId(),
$media->getId(),
EditorDocMapper::class,
'media',
'',
$request->getOrigin()
);
$ref = new Reference();
$ref->name = $media->name;
$ref->source = new NullMedia($media->getId());
$ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($accountPath);
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
$this->createModelRelation(
$request->header->account,
$collection->getId(),
$ref->getId(),
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
);
} }
} }
if (!empty($mediaFiles = $request->getDataJson('media'))) { if (!empty($mediaFiles = $request->getDataJson('media'))) {
$collection = null; $collection = null;
foreach ($mediaFiles as $media) { foreach ($mediaFiles as $media) {
EditorDocMapper::writer()->createRelationTable('media', [(int) $media], $doc->getId());
$ref = new Reference();
$ref->source = new NullMedia((int) $media);
$ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($path);
ReferenceMapper::create()->execute($ref);
if ($collection === null) { if ($collection === null) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection( $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$path, $path,
@ -323,7 +331,34 @@ final class ApiController extends Controller
); );
} }
CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId()); $this->createModelRelation(
$request->header->account,
$doc->getId(),
(int) $media,
EditorDocMapper::class,
'media',
'',
$request->getOrigin()
);
$refMedia = MediaMapper::get()->where('id', $media)->execute();
$ref = new Reference();
$ref->name = $refMedia->name;
$ref->source = new NullMedia((int) $media);
$ref->createdBy = new NullAccount($request->header->account);
$ref->setVirtualPath($path);
$this->createModel($request->header->account, $ref, ReferenceMapper::class, 'media_reference', $request->getOrigin());
$this->createModelRelation(
$request->header->account,
$collection->getId(),
$ref->getId(),
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
);
} }
} }
} }

16
Theme/Backend/Lang/api.de.lang.php
View File

@ -1,16 +0,0 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\Editor
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
return ['Navigation' => [
]];

16
Theme/Backend/Lang/api.en.lang.php
View File

@ -1,16 +0,0 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\Editor
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
return ['Navigation' => [
]];

2
Theme/Backend/editor-single.tpl.php
View File

@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-6 overflowfix"> <div class="col-xs-6 overflowfix">
<?php foreach ($tags as $tag) : ?> <?php foreach ($tags as $tag) : ?>
<span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= !\emptty($tag->icon) ? '<i class="' . $this->printHtml($tag->icon) . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span> <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"><?= !empty($tag->icon) ? '<i class="' . $this->printHtml($tag->icon) . '"></i>' : ''; ?><?= $this->printHtml($tag->getL11n()); ?></span>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
<?php if ($editable) : ?> <?php if ($editable) : ?>