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

fix pagination and some media bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-07-30 21:28:05 +02:00
parent 255cc37c71
commit 37e5156a0a
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Controller/ApiController.php
View File

@ -40,6 +40,8 @@ use phpOMS\System\MimeType;
use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\Utils\StringUtils; use phpOMS\Utils\StringUtils;
use phpOMS\Views\View; use phpOMS\Views\View;
use Modules\Media\Models\Collection;
use Modules\Media\Models\CollectionMapper;
/** /**
* Helper controller class. * Helper controller class.
@ -274,6 +276,7 @@ final class ApiController extends Controller
$files[] = new NullMedia($db); $files[] = new NullMedia($db);
} }
/** @var Collection $collection */
$collection = $this->app->moduleManager->get('Media')->createMediaCollectionFromMedia( $collection = $this->app->moduleManager->get('Media')->createMediaCollectionFromMedia(
(string) ($request->getData('name') ?? ''), (string) ($request->getData('name') ?? ''),
(string) ($request->getData('description') ?? ''), (string) ($request->getData('description') ?? ''),
@ -281,6 +284,9 @@ final class ApiController extends Controller
$request->getHeader()->getAccount() $request->getHeader()->getAccount()
); );
$collection->setPath('/Modules/Media/Files/Modules/Helper/' . ( (string) ($request->getData('name') ?? '')));
$collection->setVirtualPath('/Modules/Helper');
if ($collection instanceof NullCollection) { if ($collection instanceof NullCollection) {
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
$this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Template', 'Couldn\'t create collection for template', null); $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Template', 'Couldn\'t create collection for template', null);
@ -288,6 +294,8 @@ final class ApiController extends Controller
return; return;
} }
CollectionMapper::create($collection);
$template = $this->createTemplateFromRequest($request, $collection->getId()); $template = $this->createTemplateFromRequest($request, $collection->getId());
$this->app->moduleManager->get('Admin')->createAccountModelPermission( $this->app->moduleManager->get('Admin')->createAccountModelPermission(
@ -384,6 +392,9 @@ final class ApiController extends Controller
$request->getHeader()->getAccount() $request->getHeader()->getAccount()
); );
$collection->setPath('/Modules/Media/Files/Modules/Helper/' . ( (string) ($request->getData('name') ?? '')));
$collection->setVirtualPath('/Modules/Helper');
if ($collection instanceof NullCollection) { if ($collection instanceof NullCollection) {
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
$this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Report', 'Couldn\'t create collection for report', null); $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Report', 'Couldn\'t create collection for report', null);
@ -391,6 +402,8 @@ final class ApiController extends Controller
return; return;
} }
CollectionMapper::create($collection);
$report = $this->createReportFromRequest($request, $response, $collection->getId()); $report = $this->createReportFromRequest($request, $response, $collection->getId());
$this->app->moduleManager->get('Admin')->createAccountModelPermission( $this->app->moduleManager->get('Admin')->createAccountModelPermission(

4
Controller/BackendController.php
View File

@ -57,12 +57,12 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Helper/Theme/Backend/helper-list'); $view->setTemplate('/Modules/Helper/Theme/Backend/helper-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response));
if ($request->getData('ptype') === '-') { if ($request->getData('ptype') === 'p') {
$view->setData('reports', $view->setData('reports',
TemplateMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) TemplateMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25) ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)
); );
} elseif ($request->getData('ptype') === '+') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('reports', $view->setData('reports',
TemplateMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) TemplateMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25) ::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)

4
Theme/Backend/helper-list.tpl.php
View File

@ -20,8 +20,8 @@ use phpOMS\Uri\UriFactory;
*/ */
$templates = $this->getData('reports'); $templates = $this->getData('reports');
$previous = empty($templates) ? '{/prefix}helper/list' : '{/prefix}helper/list?{?}&id=' . \reset($templates)->getId() . '&ptype=-'; $previous = empty($templates) ? '{/prefix}helper/list' : '{/prefix}helper/list?{?}&id=' . \reset($templates)->getId() . '&ptype=p';
$next = empty($templates) ? '{/prefix}helper/list' : '{/prefix}helper/list?{?}&id=' . \end($templates)->getId() . '&ptype=+'; $next = empty($templates) ? '{/prefix}helper/list' : '{/prefix}helper/list?{?}&id=' . \end($templates)->getId() . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>

10
tests/EventCourse/EventCourse.tpl.php
View File

@ -26,7 +26,7 @@ require 'Worker.php';
</ul> </ul>
</div> </div>
<div class="tab-content"> <div class="tab-content">
<input type="radio" id="c-tab-1" name="tabular-2" checked> <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : '' ?>>
<div class="tab"> <div class="tab">
<div class="box"> <div class="box">
<table class="default"> <table class="default">
@ -195,7 +195,7 @@ require 'Worker.php';
</table> </table>
</div> </div>
</div> </div>
<input type="radio" id="c-tab-2" name="tabular-2"> <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : '' ?>>
<div class="tab"> <div class="tab">
<section class="box"> <section class="box">
<table class="default"> <table class="default">
@ -270,7 +270,7 @@ require 'Worker.php';
</table> </table>
</section> </section>
</div> </div>
<input type="radio" id="c-tab-3" name="tabular-2"> <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : '' ?>>
<div class="tab"> <div class="tab">
<section class="box"> <section class="box">
<table class="default"> <table class="default">
@ -318,7 +318,7 @@ require 'Worker.php';
</table> </table>
</section> </section>
</div> </div>
<input type="radio" id="c-tab-4" name="tabular-2"> <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : '' ?>>
<div class="tab"> <div class="tab">
<section class="box"> <section class="box">
<table class="default"> <table class="default">
@ -389,7 +389,7 @@ require 'Worker.php';
</table> </table>
</section> </section>
</div> </div>
<input type="radio" id="c-tab-5" name="tabular-2"> <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : '' ?>>
<div class="tab"> <div class="tab">
<section class="box"> <section class="box">
<table class="default"> <table class="default">