From d9a0f30ffd526f84461f32026752ca4fda1dbe5a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 2 Apr 2024 21:40:47 +0000 Subject: [PATCH] template fixes + bug fixes + style fixes --- Controller/BackendController.php | 18 +++++++++--------- Controller/SearchController.php | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 0de7ad8..e4e44da 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -74,13 +74,13 @@ final class BackendController extends Controller implements DashboardElementInte $objs = []; if ($request->getData('ptype') === 'p') { /** @var \Modules\News\Models\NewsArticle[] $objs */ - $objs = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<') + $objs = $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '<') ->execute(); $view->data['news'] = $objs; } elseif ($request->getData('ptype') === 'n') { /** @var \Modules\News\Models\NewsArticle[] $objs */ - $objs = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>') + $objs = $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '>') ->execute(); $view->data['news'] = $objs; @@ -101,7 +101,7 @@ final class BackendController extends Controller implements DashboardElementInte $seenObjects = NewsSeenMapper::getAll() ->where('seenBy', $request->header->account) ->where('news', $ids, 'in') - ->execute(); + ->executeGetArray(); $seen = []; foreach ($seenObjects as $seenObject) { @@ -133,7 +133,7 @@ final class BackendController extends Controller implements DashboardElementInte ->where('tags/title/language', $response->header->l11n->language) ->sort('publish', OrderType::DESC) ->limit(5) - ->execute(); + ->executeGetArray(); $view->data['news'] = $news; @@ -265,10 +265,10 @@ final class BackendController extends Controller implements DashboardElementInte ->limit(25); if ($request->getData('ptype') === 'p') { - $view->data['news'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<') + $view->data['news'] = $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '<') ->execute(); } elseif ($request->getData('ptype') === 'n') { - $view->data['news'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>') + $view->data['news'] = $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '>') ->execute(); } else { $view->data['news'] = $mapperQuery->where('id', 0, '>') @@ -298,11 +298,11 @@ final class BackendController extends Controller implements DashboardElementInte $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response); if ($request->getData('ptype') === 'p') { - $view->data['news'] = NewsArticleMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '<')->where('status', NewsStatus::DRAFT)->limit(25)->execute(); + $view->data['news'] = NewsArticleMapper::getAll()->where('id', $request->getDataInt('offset') ?? 0, '<')->where('status', NewsStatus::DRAFT)->limit(25)->executeGetArray(); } elseif ($request->getData('ptype') === 'n') { - $view->data['news'] = NewsArticleMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '>')->where('status', NewsStatus::DRAFT)->limit(25)->execute(); + $view->data['news'] = NewsArticleMapper::getAll()->where('id', $request->getDataInt('offset') ?? 0, '>')->where('status', NewsStatus::DRAFT)->limit(25)->executeGetArray(); } else { - $view->data['news'] = NewsArticleMapper::getAll()->where('id', 0, '>')->where('status', NewsStatus::DRAFT)->limit(25)->execute(); + $view->data['news'] = NewsArticleMapper::getAll()->where('id', 0, '>')->where('status', NewsStatus::DRAFT)->limit(25)->executeGetArray(); } return $view; diff --git a/Controller/SearchController.php b/Controller/SearchController.php index 613849e..44c46a2 100644 --- a/Controller/SearchController.php +++ b/Controller/SearchController.php @@ -66,7 +66,7 @@ final class SearchController extends Controller ->where('tags/title/content', $pattern) ->sort('publish', OrderType::DESC) ->limit(8) - ->execute(); + ->executeGetArray(); $results = []; foreach ($news as $article) { @@ -114,7 +114,7 @@ final class SearchController extends Controller ->where('tags/title/language', $response->header->l11n->language) ->sort('publish', OrderType::DESC) ->limit(8) - ->execute(); + ->executeGetArray(); $results = []; foreach ($news as $article) {