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

allow existing media files

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-02-02 20:44:28 +01:00
parent a642984d4a
commit da4ef730ff
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Controller/ApiController.php
View File

@ -243,13 +243,17 @@ final class ApiController extends Controller
*/ */
public function apiTemplateCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTemplateCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
$files = $this->app->moduleManager->get('Media')->uploadFiles( $files = $request->getDataJson('media-list');
$request->getData('name') ?? '',
$request->getFiles(), if (empty($files)) {
$request->getHeader()->getAccount(), $files = $this->app->moduleManager->get('Media')->uploadFiles(
__DIR__ . '/../../../Modules/Media/Files', $request->getData('name') ?? '',
'' $request->getFiles(),
); $request->getHeader()->getAccount(),
__DIR__ . '/../../../Modules/Media/Files',
''
);
}
$collection = $this->app->moduleManager->get('Media')->createMediaCollectionFromMedia( $collection = $this->app->moduleManager->get('Media')->createMediaCollectionFromMedia(
(string) ($request->getData('name') ?? ''), (string) ($request->getData('name') ?? ''),

6
Theme/Backend/helper-single.tpl.php
View File

@ -27,10 +27,8 @@ $lang = $reportLanguage[$cLang] ?? [];
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>
<div class="row" style="height: calc(100% - 85px);"> <div class="row" style="height: calc(100% - 85px);">
<div class="col-xs-12"> <div class="col-xs-12 col-md-9">
<div class="box wf-100" style="height: 100%;"> <iframe src="<?= \phpOMS\Uri\UriFactory::build('{/api}helper/report/export/?id=' . $template->getId()); ?>" allowfullscreen></iframe>
<iframe src="<?= \phpOMS\Uri\UriFactory::build('{/api}helper/report/export/?id=' . $template->getId()); ?>" allowfullscreen></iframe>
</div>
</div> </div>
<div class="col-xs-12 col-md-3"> <div class="col-xs-12 col-md-3">
<?php if (\count($reportLanguage) > 1) : ?> <?php if (\count($reportLanguage) > 1) : ?>