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

started with template fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-03-29 15:26:00 +00:00
parent 0d19a86665
commit c6c495b3bc
9 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Admin/Routes/Web/Api.php
View File

@ -22,6 +22,7 @@ return [
[
'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpload',
'verb' => RouteVerb::PUT,
'csrf' => true,
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
@ -31,6 +32,7 @@ return [
[
'dest' => '\Modules\Media\Controller\ApiController:apiMediaUpdate',
'verb' => RouteVerb::SET,
'csrf' => true,
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
@ -42,6 +44,7 @@ return [
[
'dest' => '\Modules\Media\Controller\ApiController:apiMediaCreate',
'verb' => RouteVerb::PUT,
'csrf' => true,
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,
@ -53,6 +56,7 @@ return [
[
'dest' => '\Modules\Media\Controller\ApiController:apiMediaExport',
'verb' => RouteVerb::GET,
'csrf' => true,
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::READ,
@ -64,6 +68,7 @@ return [
[
'dest' => '\Modules\Media\Controller\ApiController:apiCollectionCreate',
'verb' => RouteVerb::PUT,
'csrf' => true,
'permission' => [
'module' => ApiController::NAME,
'type' => PermissionType::CREATE,

2
Controller/ApiController.php
View File

@ -1015,7 +1015,7 @@ final class ApiController extends Controller
$childCollection->setVirtualPath('/'. \ltrim($virtual, '/'));
// We assume that the new path is real path of the first found parent directory + the new virtual path
$childCollection->setPath($real . '/' . \ltrim($newVirtual, '/'));
$childCollection->setPath(\rtrim($real, '/') . '/' . \ltrim($newVirtual, '/'));
$this->createModel($account, $childCollection, CollectionMapper::class, 'collection', '127.0.0.1');
$this->createModelRelation(

8
Models/MediaMapper.php
View File

@ -190,8 +190,12 @@ class MediaMapper extends DataMapperFactory
*/
public static function getParentCollection(string $path = '/') : ReadMapper
{
$virtualPath = '/' . \trim(\substr($path, 0, \strripos($path, '/') + 1), '/');
$name = \substr($path, \strripos($path, '/') + 1);
$path = \dirname($path);
$name = \basename($path);
$virtualPath = '/' . \trim(\dirname($path), '/');
//$virtualPath = '/' . \trim(\substr($path, 0, \strripos($path, '/') + 1), '/');
//$name = \substr($path, \strripos($path, '/') + 1);
return CollectionMapper::get()
->with('sources')

2
Theme/Backend/Components/Media/invalidPassword.tpl.php
View File

@ -18,7 +18,7 @@ use phpOMS\Uri\UriFactory;
<section id="mediaFile" class="portlet">
<div class="portlet-body">
<form id="mediaPassword" method="GET" action="<?= UriFactory::build('{%}'); ?>">
<form id="mediaPassword" method="GET" action="<?= UriFactory::build('{%}&csrf={$CSRF}'); ?>">
<div class="form-group">
<label for="iPassword"><?= $this->getHtml('Password'); ?></label>
<input id="iPassword" type="password" name="password">

2
Theme/Backend/Components/Media/list.tpl.php
View File

@ -58,8 +58,10 @@ $next = empty($this->media)
<?php endif; ?>
</table>
</div>
<!--
<div class="portlet-foot">
<a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
<a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
</div>
-->
</div>

2
Theme/Backend/Components/Upload/upload-list.tpl.php
View File

@ -99,7 +99,7 @@ use phpOMS\Uri\UriFactory;
<input id="iFile-<?= $file->id; ?>" type="radio" name="media_file" value="<?= $file->id; ?>"<?= \end($this->files)->id === $file->id ? ' checked' : ''; ?>>
<span class="checkmark"></span>
</label>
<td data-tpl-text="/id" data-tpl-value="/id" data-value=""><?= $this->printHtml((string) $file->id); ?></td>
<td data-tpl-text="/id" data-tpl-value="/id" data-value=""><?= $file->id; ?></td>
<td data-tpl-text="/name" data-tpl-value="/name" data-value=""><?= $this->printHtml($file->name); ?></td>
<td><a href="<?= $url; ?>"><i class="g-icon">attachment</i></a>
<?php endforeach; ?>

4
Theme/Backend/media-collection-create.tpl.php
View File

@ -22,14 +22,14 @@ use phpOMS\Uri\UriFactory;
<div class="row">
<div class="col-xs-12">
<div class="box">
<a tabindex="0" class="button" href="<?= UriFactory::build('{/base}/media/list?path={?path}'); ?>"><?= $this->getHtml('Back', '0', '0'); ?></a>
<a tabindex="0" class="button" href="<?= UriFactory::build('{/base}/media/list?path={?path}&csrf={$CSRF}'); ?>"><?= $this->getHtml('Back', '0', '0'); ?></a>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-md-6">
<form method="PUT" id="media-uploader" action="<?= UriFactory::build('{/api}media/collection'); ?>">
<form method="PUT" id="media-uploader" action="<?= UriFactory::build('{/api}media/collection?csrf={$CSRF}'); ?>">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('CreateCollection'); ?></div>
<div class="portlet-body">

2
Theme/Backend/media-file-create.tpl.php
View File

@ -75,7 +75,7 @@ use phpOMS\Uri\UriFactory;
<option>
</select>
<tr><td colspan="2"><label><?= $this->getHtml('GroupUser'); ?></label>
<tr><td><input id="iPermission" name="group" type="text" placeholder=""><td><button><?= $this->getHtml('Add'); ?></button>
<tr><td><input id="iPermission" name="group" type="text"><td><button><?= $this->getHtml('Add'); ?></button>
</table>
</form>
</div>

2
Theme/Backend/media-upload.tpl.php
View File

@ -29,7 +29,7 @@ use phpOMS\Uri\UriFactory;
<div class="row">
<div class="col-xs-12 col-md-6">
<form method="PUT" id="media-uploader" action="<?= UriFactory::build('{/api}media'); ?>">
<form method="PUT" id="media-uploader" action="<?= UriFactory::build('{/api}media?csrf={$CSRF}'); ?>">
<div class="portlet">
<div class="portlet-head"><?= $this->getHtml('Upload'); ?></div>
<div class="portlet-body">