From eaefdf125662d95bf38ce31eccda96e9d4049e0b Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 22 Jan 2022 21:56:00 +0100
Subject: [PATCH] bug fixes and permission tests

---
 Controller/BackendController.php | 16 ++++++++++++----
 Theme/Backend/audit-list.tpl.php |  9 ++++++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index ca5a5e4..90728aa 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -51,11 +51,19 @@ final class BackendController extends Controller
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response));
 
         if ($request->getData('ptype') === 'p') {
-            $view->setData('audits', AuditMapper::getAll()->with('createdBy')->sort('createdAt', OrderType::DESC)->where('id', (int) ($request->getData('id') ?? 0), '<')->limit(25)->execute());
+            $data = AuditMapper::getAll()->with('createdBy')->sort('id', OrderType::ASC)->where('id', (int) ($request->getData('id') ?? 0), '>')->limit(25)->execute();
+
+            if (empty($data)) {
+                $data = AuditMapper::getAll()->with('createdBy')->sort('id', OrderType::DESC)->where('id', 0, '>')->limit(25)->execute();
+            } else {
+                $data = \array_reverse($data);
+            }
+
+            $view->setData('audits', $data);
         } elseif ($request->getData('ptype') === 'n') {
-            $view->setData('audits', AuditMapper::getAll()->with('createdBy')->sort('createdAt', OrderType::DESC)->where('id', (int) ($request->getData('id') ?? 0), '>')->limit(25)->execute());
+            $view->setData('audits', AuditMapper::getAll()->with('createdBy')->sort('id', OrderType::DESC)->where('id', (int) ($request->getData('id') ?? 0), '<')->limit(25)->execute());
         } else {
-            $view->setData('audits', AuditMapper::getAll()->with('createdBy')->sort('createdAt', OrderType::DESC)->where('id', 0, '>')->limit(25)->execute());
+            $view->setData('audits', AuditMapper::getAll()->with('createdBy')->sort('id', OrderType::DESC)->where('id', 0, '>')->limit(25)->execute());
         }
 
         return $view;
@@ -80,7 +88,7 @@ final class BackendController extends Controller
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1006201001, $request, $response));
 
         /** @var \Modules\Auditor\Models\Audit $audit */
-        $audit = AuditMapper::get()->where('id', (int) $request->getData('id'))->execute();
+        $audit = AuditMapper::get()->with('createdBy')->where('id', (int) $request->getData('id'))->execute();
         $view->setData('audit', $audit);
 
         return $view;
diff --git a/Theme/Backend/audit-list.tpl.php b/Theme/Backend/audit-list.tpl.php
index c5974d5..7860d89 100755
--- a/Theme/Backend/audit-list.tpl.php
+++ b/Theme/Backend/audit-list.tpl.php
@@ -28,7 +28,14 @@ echo $this->getData('nav')->render(); ?>
 <div class="row">
     <div class="col-xs-12">
         <div class="portlet">
-            <div class="portlet-head"><?= $this->getHtml('Audits'); ?><i class="fa fa-download floatRight download btn"></i></div>
+            <div class="portlet-head">
+                <span>
+                    <a href="<?= UriFactory::build($previous); ?>"><i class="fa fa-chevron-left btn"></i></a>
+                    <?= $this->getHtml('Audits'); ?>
+                    <a href="<?= UriFactory::build($next); ?>"><i class="fa fa-chevron-right btn"></i></a>
+                </span>
+
+                <i class="fa fa-download floatRight download btn"></i></div>
             <div class="slider">
             <table id="auditList" class="default sticky">
                 <thead>