Jingga/oms-Editor
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Editor.git synced 2026-02-12 16:28:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-12 00:52:06 +00:00
parent 0a912e043f
commit fd8b41cdaf
3 changed files with 40 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin/Install/Navigation.install.json
View File

@ -5,7 +5,7 @@
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Editor", "name": "Editor",
"uri": "{/base}/editor/list?{?}", "uri": "{/base}/editor/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 20, "order": 20,
@ -19,7 +19,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "List", "name": "List",
"uri": "{/base}/editor/list?{?}", "uri": "{/base}/editor/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -34,7 +34,7 @@
"type": 3, "type": 3,
"subtype": 5, "subtype": 5,
"name": "Create", "name": "Create",
"uri": "{/base}/editor/create?{?}", "uri": "{/base}/editor/create",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 15, "order": 15,

147
Controller/ApiController.php
View File

@ -23,11 +23,8 @@ use Modules\Editor\Models\EditorDocHistoryMapper;
use Modules\Editor\Models\EditorDocMapper; use Modules\Editor\Models\EditorDocMapper;
use Modules\Editor\Models\PermissionCategory; use Modules\Editor\Models\PermissionCategory;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\Media;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use Modules\Media\Models\Reference;
use Modules\Media\Models\ReferenceMapper;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Asset\AssetType; use phpOMS\Asset\AssetType;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
@ -124,97 +121,42 @@ final class ApiController extends Controller
$path = $this->createEditorDir($doc); $path = $this->createEditorDir($doc);
/** @var \Modules\Admin\Models\Account $account */ /** @var \Modules\Admin\Models\Account $account */
$account = AccountMapper::get()->where('id', $request->header->account)->execute(); $account = AccountMapper::get()->where('id', $request->header->account)->execute();
$accountPath = '/Accounts/' . $account->id . ' ' . $account->login
. '/Editor/'
. $doc->createdAt->format('Y/m')
. '/' . $doc->id;
$collection = null; if (!empty($request->files)) {
if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
[], names: [],
[], fileNames: [],
$uploadedFiles, files: $request->files,
$request->header->account, account: $request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path, basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
$path, virtualPath: $path,
rel: $doc->id,
mapper: EditorDocMapper::class,
field: 'files'
); );
foreach ($uploaded as $media) { if ($account->id !== 0) {
$accountPath = '/Accounts/' . $account->id . ' ' . $account->login $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
. '/Editor/' account: $request->header->account,
. $doc->createdAt->format('Y/m') files: \array_map(function (Media $media) { return $media->id; }, $uploaded->sources),
. '/' . $doc->id; collectionPath: $accountPath
$collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$accountPath,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->id . '/Editor/' . $doc->createdAt->format('Y/m') . '/' . $doc->id
);
$this->createModelRelation(
$request->header->account,
$doc->id,
$media->id,
EditorDocMapper::class,
'files',
'',
$request->getOrigin()
);
$ref = new Reference();
$ref->name = $media->name;
$ref->source = new NullMedia($media->id);
$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->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
); );
} }
} }
$mediaFiles = $request->getDataJson('media'); if (!empty($media = $request->getDataJson('media'))) {
foreach ($mediaFiles as $media) { $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
$collection ??= $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$path,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path
);
$this->createModelRelation(
$request->header->account, $request->header->account,
$media,
$doc->id, $doc->id,
(int) $media,
EditorDocMapper::class, EditorDocMapper::class,
'files', 'files',
'', $path
$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->id,
$ref->id,
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
); );
} }
} }
@ -394,11 +336,9 @@ final class ApiController extends Controller
return; return;
} }
$uploadedFiles = $request->files; if (empty($request->files)) {
if (empty($uploadedFiles)) {
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
$this->createInvalidAddResponse($request, $response, $uploadedFiles); $this->createInvalidAddResponse($request, $response, $request->files);
return; return;
} }
@ -406,41 +346,24 @@ final class ApiController extends Controller
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: $request->getDataList('names'), names: $request->getDataList('names'),
fileNames: $request->getDataList('filenames'), fileNames: $request->getDataList('filenames'),
files: $uploadedFiles, files: $request->files,
account: $request->header->account, account: $request->header->account,
basePath: __DIR__ . '/../../../Modules/Media/Files/Modules/Editor/' . ($request->getData('doc') ?? '0'), basePath: __DIR__ . '/../../../Modules/Media/Files/Modules/Editor/' . ($request->getData('doc') ?? '0'),
virtualPath: '/Modules/Editor/' . ($request->getData('doc') ?? '0'), virtualPath: '/Modules/Editor/' . ($request->getData('doc') ?? '0'),
pathSettings: PathSettings::FILE_PATH pathSettings: PathSettings::FILE_PATH,
type: $request->getDataInt('type'),
rel: (int) $request->getDataInt('doc'),
mapper: EditorDocMapper::class,
field: 'files'
); );
if ($request->hasData('type')) { if (empty($uploaded->sources)) {
foreach ($uploaded as $file) {
$this->createModelRelation(
$request->header->account,
$file->id,
$request->getDataInt('type'),
MediaMapper::class,
'types',
'',
$request->getOrigin()
);
}
}
if (empty($uploaded)) {
$this->createInvalidAddResponse($request, $response, []); $this->createInvalidAddResponse($request, $response, []);
return; return;
} }
$this->createModelRelation( $this->createStandardAddResponse($request, $response, $uploaded->sources);
$request->header->account,
(int) $request->getData('doc'),
\reset($uploaded)->id,
EditorDocMapper::class, 'files', '', $request->getOrigin()
);
$this->createStandardAddResponse($request, $response, $uploaded);
} }
/** /**

4
Theme/Backend/Components/Note/base.tpl.php
View File

@ -47,7 +47,7 @@ use phpOMS\Uri\UriFactory;
<tbody <tbody
id="iNoteInput-tags" id="iNoteInput-tags"
class="tags" class="tags"
data-action='[{"listener": "change", "action": [{"key": 1, "type": "dom.set", "selector": "#iNoteNote", "value": "<?= UriFactory::build('{/api}editor/export') . '?id={!#iNotes [name=doc_doc]:checked}&type=html'; ?>"}]}]' data-action='[{"listener": "change", "action": [{"key": 1, "type": "dom.set", "selector": "#iNoteNote", "value": "<?= UriFactory::build('{/api}editor/export?csrf={$CSRF}') . '&id={!#iNotes [name=doc_doc]:checked}&type=html'; ?>"}]}]'
data-limit="0" data-limit="0"
data-active="true" data-active="true"
data-form="<?= $this->form; ?>" data-form="<?= $this->form; ?>"
@ -89,7 +89,7 @@ use phpOMS\Uri\UriFactory;
<section id="docNote" class="portlet col-simple"> <section id="docNote" class="portlet col-simple">
<div class="portlet-body col-simple"> <div class="portlet-body col-simple">
<?php if (!empty($this->docs)) : ?> <?php if (!empty($this->docs)) : ?>
<iframe class="col-simple" id="iNoteNote" data-src="<?= UriFactory::build('{/api}editor/export') . '?id={!#iNotes [name=doc_doc]:checked}&type=html'; ?>" allowfullscreen></iframe> <iframe class="col-simple" id="iNoteNote" data-src="<?= UriFactory::build('{/api}editor/export?csrf={$CSRF}') . '&id={!#iNotes [name=doc_doc]:checked}&type=html'; ?>" allowfullscreen></iframe>
<?php else : ?> <?php else : ?>
<img width="100%" src="Web/Backend/img/logo_grey.png"> <img width="100%" src="Web/Backend/img/logo_grey.png">
<?php endif; ?> <?php endif; ?>