fix pagination and some media bugs

This commit is contained in:
Dennis Eichhorn 2020-07-30 21:28:04 +02:00
parent bd1874acb7
commit 721fca3579
3 changed files with 19 additions and 5 deletions

View File

@ -51,9 +51,9 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Auditor/Theme/Backend/audit-list'); $view->setTemplate('/Modules/Auditor/Theme/Backend/audit-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response));
if ($request->getData('ptype') === '-') { if ($request->getData('ptype') === 'p') {
$view->setData('audits', AuditMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)); $view->setData('audits', AuditMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25));
} elseif ($request->getData('ptype') === '+') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('audits', AuditMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)); $view->setData('audits', AuditMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25));
} else { } else {
$view->setData('audits', AuditMapper::getAfterPivot(0, null, 25)); $view->setData('audits', AuditMapper::getAfterPivot(0, null, 25));

View File

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

View File

@ -12,15 +12,29 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use phpOMS\Message\Http\HttpHeader;
use phpOMS\Views\ViewAbstract; use phpOMS\Views\ViewAbstract;
/** @var \phpOMS\Views\View $this */
/** @var \Modules\Auditor\Models\Audit $audit */ /** @var \Modules\Auditor\Models\Audit $audit */
$audit = $this->getData('audit'); $audit = $this->getData('audit');
$headers = HttpHeader::getAllHeaders();
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); echo $this->getData('nav')->render();
?> ?>
<?php if (isset($headers['Referer'])) : ?>
<div class="row">
<div class="col-xs-12">
<div class="box">
<a tabindex="0" class="button" href="<?= $headers['Referer']; ?>"><?= $this->getHtml('Back', '0', '0'); ?></a>
</div>
</div>
</div>
<?php endif; ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="portlet"> <div class="portlet">