Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-16 08:28:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix pagination and some media bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-07-30 21:28:05 +02:00
parent 0865be0f93
commit 30ef108908
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/BackendController.php
View File

@ -57,14 +57,14 @@ final class BackendController extends Controller implements DashboardElementInte
$view->setTemplate('/Modules/News/Theme/Backend/news-dashboard'); $view->setTemplate('/Modules/News/Theme/Backend/news-dashboard');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response));
if ($request->getData('ptype') === '-') { if ($request->getData('ptype') === 'p') {
$view->setData('news', $view->setData('news',
NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) ::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class])
::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=') ::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=')
::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25) ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)
); );
} elseif ($request->getData('ptype') === '+') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('news', $view->setData('news',
NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) ::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class])
@ -168,13 +168,13 @@ final class BackendController extends Controller implements DashboardElementInte
$view->setTemplate('/Modules/News/Theme/Backend/news-archive'); $view->setTemplate('/Modules/News/Theme/Backend/news-archive');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response));
if ($request->getData('ptype') === '-') { if ($request->getData('ptype') === 'p') {
$view->setData('news', $view->setData('news',
NewsArticleMapper::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) NewsArticleMapper::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class])
::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=') ::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=')
::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25) ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)
); );
} elseif ($request->getData('ptype') === '+') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('news', $view->setData('news',
NewsArticleMapper::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) NewsArticleMapper::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class])
::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=') ::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=')
@ -208,11 +208,11 @@ final class BackendController extends Controller implements DashboardElementInte
$view->setTemplate('/Modules/News/Theme/Backend/news-draft'); $view->setTemplate('/Modules/News/Theme/Backend/news-draft');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response));
if ($request->getData('ptype') === '-') { if ($request->getData('ptype') === 'p') {
$view->setData('news', $view->setData('news',
NewsArticleMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25) NewsArticleMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)
); );
} elseif ($request->getData('ptype') === '+') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('news', $view->setData('news',
NewsArticleMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25) NewsArticleMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)
); );

4
Theme/Backend/news-archive.tpl.php
View File

@ -19,8 +19,8 @@ use phpOMS\Uri\UriFactory;
/** @var \Modules\News\Models\NewsArticle[] $newsList */ /** @var \Modules\News\Models\NewsArticle[] $newsList */
$articles = $this->getData('news') ?? []; $articles = $this->getData('news') ?? [];
$previous = empty($newsList) ? '{/prefix}news/archive' : '{/prefix}news/archive?{?}&id=' . \reset($newsList)->getId() . '&ptype=-'; $previous = empty($newsList) ? '{/prefix}news/archive' : '{/prefix}news/archive?{?}&id=' . \reset($newsList)->getId() . '&ptype=p';
$next = empty($newsList) ? '{/prefix}news/archive' : '{/prefix}news/archive?{?}&id=' . \end($newsList)->getId() . '&ptype=+'; $next = empty($newsList) ? '{/prefix}news/archive' : '{/prefix}news/archive?{?}&id=' . \end($newsList)->getId() . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>

4
Theme/Backend/news-dashboard.tpl.php
View File

@ -18,8 +18,8 @@ use \phpOMS\Uri\UriFactory;
/** @var \Modules\News\Models\NewsArticle[] $newsList */ /** @var \Modules\News\Models\NewsArticle[] $newsList */
$newsList = $this->getData('news'); $newsList = $this->getData('news');
$previous = empty($newsList) ? '{/prefix}news/dashboard' : '{/prefix}news/dashboard?{?}&id=' . \reset($newsList)->getId() . '&ptype=-'; $previous = empty($newsList) ? '{/prefix}news/dashboard' : '{/prefix}news/dashboard?{?}&id=' . \reset($newsList)->getId() . '&ptype=p';
$next = empty($newsList) ? '{/prefix}news/dashboard' : '{/prefix}news/dashboard?{?}&id=' . \end($newsList)->getId() . '&ptype=+'; $next = empty($newsList) ? '{/prefix}news/dashboard' : '{/prefix}news/dashboard?{?}&id=' . \end($newsList)->getId() . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>

4
Theme/Backend/news-draft.tpl.php
View File

@ -19,8 +19,8 @@ use phpOMS\Uri\UriFactory;
/** @var \Modules\News\Models\NewsArticle[] $newsList */ /** @var \Modules\News\Models\NewsArticle[] $newsList */
$articles = $this->getData('news') ?? []; $articles = $this->getData('news') ?? [];
$previous = empty($newsList) ? '{/prefix}news/draft/list' : '{/prefix}news/draft/list?{?}&id=' . \reset($newsList)->getId() . '&ptype=-'; $previous = empty($newsList) ? '{/prefix}news/draft/list' : '{/prefix}news/draft/list?{?}&id=' . \reset($newsList)->getId() . '&ptype=p';
$next = empty($newsList) ? '{/prefix}news/draft/list' : '{/prefix}news/draft/list?{?}&id=' . \end($newsList)->getId() . '&ptype=+'; $next = empty($newsList) ? '{/prefix}news/draft/list' : '{/prefix}news/draft/list?{?}&id=' . \end($newsList)->getId() . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>