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

simplify getLanguage call in request

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-11-10 22:13:15 +01:00
parent 17806c2667
commit aff39aca44
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Controller/ApiController.php
View File

@ -163,7 +163,7 @@ final class ApiController extends Controller
$newsArticle->setTitle((string) ($request->getData('title') ?? '')); $newsArticle->setTitle((string) ($request->getData('title') ?? ''));
$newsArticle->setPlain($request->getData('plain') ?? ''); $newsArticle->setPlain($request->getData('plain') ?? '');
$newsArticle->setContent(Markdown::parse((string) ($request->getData('plain') ?? ''))); $newsArticle->setContent(Markdown::parse((string) ($request->getData('plain') ?? '')));
$newsArticle->setLanguage(\strtolower((string) ($request->getData('lang') ?? $request->getHeader()->getL11n()->getLanguage()))); $newsArticle->setLanguage(\strtolower((string) ($request->getData('lang') ?? $request->getLanguage())));
$newsArticle->setType((int) ($request->getData('type') ?? NewsType::ARTICLE)); $newsArticle->setType((int) ($request->getData('type') ?? NewsType::ARTICLE));
$newsArticle->setStatus((int) ($request->getData('status') ?? NewsStatus::VISIBLE)); $newsArticle->setStatus((int) ($request->getData('status') ?? NewsStatus::VISIBLE));
$newsArticle->setFeatured((bool) ($request->getData('featured') ?? true)); $newsArticle->setFeatured((bool) ($request->getData('featured') ?? true));

8
Controller/BackendController.php
View File

@ -58,21 +58,21 @@ final class BackendController extends Controller implements DashboardElementInte
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->setData('news', $view->setData('news',
NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) NewsArticleMapper::withConditional('language', $response->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') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('news', $view->setData('news',
NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) NewsArticleMapper::withConditional('language', $response->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], '<=')
::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25) ::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)
); );
} else { } else {
$view->setData('news', $view->setData('news',
NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) NewsArticleMapper::withConditional('language', $response->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], '<=')
::getAfterPivot(0, null, 25) ::getAfterPivot(0, null, 25)
@ -90,7 +90,7 @@ final class BackendController extends Controller implements DashboardElementInte
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/News/Theme/Backend/dashboard-news'); $view->setTemplate('/Modules/News/Theme/Backend/dashboard-news');
$news = NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) $news = NewsArticleMapper::withConditional('language', $response->getLanguage())
::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=') ::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=')
::getNewest(5); ::getNewest(5);