From 83ef162fcc4475b0da46d6052ec366e08fd95f9a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 5 Mar 2020 22:30:00 +0100 Subject: [PATCH] remove parameters after list (id) must not be set --- Admin/Install/Navigation.install.json | 8 ++++---- Controller/BackendController.php | 7 +++++-- Theme/Backend/audit-list.tpl.php | 12 +++++++++++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index d6e13df..b1fec6f 100644 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "Auditor", - "uri": "{/prefix}admin/audit/list?{?}", + "uri": "{/prefix}admin/audit/list", "target": "self", "icon": null, "order": 75, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "Audits", - "uri": "{/prefix}admin/audit/list?{?}", + "uri": "{/prefix}admin/audit/list", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 3, "subtype": 1, "name": "Modules", - "uri": "{/prefix}admin/audit/module/list?{?}", + "uri": "{/prefix}admin/audit/module/list", "target": "self", "icon": null, "order": 5, @@ -49,7 +49,7 @@ "type": 3, "subtype": 1, "name": "Accounts", - "uri": "{/prefix}admin/audit/account/list?{?}", + "uri": "{/prefix}admin/audit/account/list", "target": "self", "icon": null, "order": 10, diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 61f7643..a53f6a5 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -51,8 +51,11 @@ final class BackendController extends Controller $view->setTemplate('/Modules/Auditor/Theme/Backend/audit-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response)); - $list = AuditMapper::getNewest(50); - $view->setData('audits', $list); + if ($request->getData('ptype') === '-') { + $view->setData('audits', AuditMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)); + } else { + $view->setData('audits', AuditMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)); + } return $view; } diff --git a/Theme/Backend/audit-list.tpl.php b/Theme/Backend/audit-list.tpl.php index 5fc7c6c..a1d0701 100644 --- a/Theme/Backend/audit-list.tpl.php +++ b/Theme/Backend/audit-list.tpl.php @@ -12,10 +12,17 @@ */ declare(strict_types=1); +use phpOMS\Uri\UriFactory; + /** * @var \phpOMS\Views\View $this + * @var \Modules\Audit\Models\Audit[] $audits */ $audits = $this->getData('audits') ?? []; + +$previous = empty($audits) ? '{/prefix}admin/audit/list' : '{/prefix}admin/audit/list?{?}&id=' . \reset($audits)->getId() . '&ptype=-'; +$next = empty($audits) ? '{/prefix}admin/audit/list' : '{/prefix}admin/audit/list?{?}&id=' . \end($audits)->getId() . '&ptype=+'; + echo $this->getData('nav')->render(); ?>
@@ -63,7 +70,10 @@ echo $this->getData('nav')->render(); ?> getHtml('Empty', '0', '0'); ?> -
+
+ Previous + Next +