diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 2528860..861cc5b 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -57,14 +57,14 @@ final class BackendController extends Controller implements DashboardElementInte $view->setTemplate('/Modules/News/Theme/Backend/news-dashboard'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); - if ($request->getData('ptype') === '-') { + if ($request->getData('ptype') === 'p') { $view->setData('news', NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) ::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) ::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=') ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25) ); - } elseif ($request->getData('ptype') === '+') { + } elseif ($request->getData('ptype') === 'n') { $view->setData('news', NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) ::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->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); - if ($request->getData('ptype') === '-') { + if ($request->getData('ptype') === 'p') { $view->setData('news', NewsArticleMapper::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) ::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=') ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25) ); - } elseif ($request->getData('ptype') === '+') { + } elseif ($request->getData('ptype') === 'n') { $view->setData('news', NewsArticleMapper::withConditional('status', NewsStatus::VISIBLE, [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->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000701001, $request, $response)); - if ($request->getData('ptype') === '-') { + if ($request->getData('ptype') === 'p') { $view->setData('news', NewsArticleMapper::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25) ); - } elseif ($request->getData('ptype') === '+') { + } elseif ($request->getData('ptype') === 'n') { $view->setData('news', NewsArticleMapper::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25) ); diff --git a/Theme/Backend/news-archive.tpl.php b/Theme/Backend/news-archive.tpl.php index b867841..8af62f8 100755 --- a/Theme/Backend/news-archive.tpl.php +++ b/Theme/Backend/news-archive.tpl.php @@ -19,8 +19,8 @@ use phpOMS\Uri\UriFactory; /** @var \Modules\News\Models\NewsArticle[] $newsList */ $articles = $this->getData('news') ?? []; -$previous = empty($newsList) ? '{/prefix}news/archive' : '{/prefix}news/archive?{?}&id=' . \reset($newsList)->getId() . '&ptype=-'; -$next = empty($newsList) ? '{/prefix}news/archive' : '{/prefix}news/archive?{?}&id=' . \end($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=n'; echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/news-dashboard.tpl.php b/Theme/Backend/news-dashboard.tpl.php index 3c65b8b..89e6f2d 100755 --- a/Theme/Backend/news-dashboard.tpl.php +++ b/Theme/Backend/news-dashboard.tpl.php @@ -18,8 +18,8 @@ use \phpOMS\Uri\UriFactory; /** @var \Modules\News\Models\NewsArticle[] $newsList */ $newsList = $this->getData('news'); -$previous = empty($newsList) ? '{/prefix}news/dashboard' : '{/prefix}news/dashboard?{?}&id=' . \reset($newsList)->getId() . '&ptype=-'; -$next = empty($newsList) ? '{/prefix}news/dashboard' : '{/prefix}news/dashboard?{?}&id=' . \end($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=n'; echo $this->getData('nav')->render(); ?> diff --git a/Theme/Backend/news-draft.tpl.php b/Theme/Backend/news-draft.tpl.php index 4e16001..1d1400d 100644 --- a/Theme/Backend/news-draft.tpl.php +++ b/Theme/Backend/news-draft.tpl.php @@ -19,8 +19,8 @@ use phpOMS\Uri\UriFactory; /** @var \Modules\News\Models\NewsArticle[] $newsList */ $articles = $this->getData('news') ?? []; -$previous = empty($newsList) ? '{/prefix}news/draft/list' : '{/prefix}news/draft/list?{?}&id=' . \reset($newsList)->getId() . '&ptype=-'; -$next = empty($newsList) ? '{/prefix}news/draft/list' : '{/prefix}news/draft/list?{?}&id=' . \end($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=n'; echo $this->getData('nav')->render(); ?>