Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-01-11 16:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

template fixes + bug fixes + style fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-02 21:40:47 +00:00
parent 1467a57d33
commit d9a0f30ffd
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Controller/BackendController.php
View File

@ -74,13 +74,13 @@ final class BackendController extends Controller implements DashboardElementInte
$objs = []; $objs = [];
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
/** @var \Modules\News\Models\NewsArticle[] $objs */ /** @var \Modules\News\Models\NewsArticle[] $objs */
$objs = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<') $objs = $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '<')
->execute(); ->execute();
$view->data['news'] = $objs; $view->data['news'] = $objs;
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
/** @var \Modules\News\Models\NewsArticle[] $objs */ /** @var \Modules\News\Models\NewsArticle[] $objs */
$objs = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>') $objs = $mapperQuery->where('id', $request->getDataInt('offset') ?? 0, '>')
->execute(); ->execute();
$view->data['news'] = $objs; $view->data['news'] = $objs;
@ -101,7 +101,7 @@ final class BackendController extends Controller implements DashboardElementInte
$seenObjects = NewsSeenMapper::getAll() $seenObjects = NewsSeenMapper::getAll()
->where('seenBy', $request->header->account) ->where('seenBy', $request->header->account)
->where('news', $ids, 'in') ->where('news', $ids, 'in')
->execute(); ->executeGetArray();
$seen = []; $seen = [];
foreach ($seenObjects as $seenObject) { foreach ($seenObjects as $seenObject) {
@ -133,7 +133,7 @@ final class BackendController extends Controller implements DashboardElementInte
->where('tags/title/language', $response->header->l11n->language) ->where('tags/title/language', $response->header->l11n->language)
->sort('publish', OrderType::DESC) ->sort('publish', OrderType::DESC)
->limit(5) ->limit(5)
->execute(); ->executeGetArray();
$view->data['news'] = $news; $view->data['news'] = $news;
@ -265,10 +265,10 @@ final class BackendController extends Controller implements DashboardElementInte
->limit(25); ->limit(25);
if ($request->getData('ptype') === 'p') { 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(); ->execute();
} elseif ($request->getData('ptype') === 'n') { } 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(); ->execute();
} else { } else {
$view->data['news'] = $mapperQuery->where('id', 0, '>') $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); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response);
if ($request->getData('ptype') === 'p') { 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') { } 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 { } 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; return $view;

4
Controller/SearchController.php
View File

@ -66,7 +66,7 @@ final class SearchController extends Controller
->where('tags/title/content', $pattern) ->where('tags/title/content', $pattern)
->sort('publish', OrderType::DESC) ->sort('publish', OrderType::DESC)
->limit(8) ->limit(8)
->execute(); ->executeGetArray();
$results = []; $results = [];
foreach ($news as $article) { foreach ($news as $article) {
@ -114,7 +114,7 @@ final class SearchController extends Controller
->where('tags/title/language', $response->header->l11n->language) ->where('tags/title/language', $response->header->l11n->language)
->sort('publish', OrderType::DESC) ->sort('publish', OrderType::DESC)
->limit(8) ->limit(8)
->execute(); ->executeGetArray();
$results = []; $results = [];
foreach ($news as $article) { foreach ($news as $article) {