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

Continue with getter/setter cleanup

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 15:44:21 +02:00
parent b1457fe4ca
commit 10d91b29cb
8 changed files with 46 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Controller/BackendController.php
View File

@ -54,7 +54,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/news-dashboard'); $view->setTemplate('/Modules/News/Theme/Backend/news-dashboard');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response);
$mapperQuery = NewsArticleMapper::getAll() $mapperQuery = NewsArticleMapper::getAll()
->with('createdBy') ->with('createdBy')
@ -72,19 +72,19 @@ final class BackendController extends Controller implements DashboardElementInte
$objs = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<') $objs = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<')
->limit(25)->execute(); ->limit(25)->execute();
$view->setData('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('id') ?? 0, '>')
->limit(25)->execute(); ->limit(25)->execute();
$view->setData('news', $objs); $view->data['news'] = $objs;
} else { } else {
/** @var \Modules\News\Models\NewsArticle[] $objs */ /** @var \Modules\News\Models\NewsArticle[] $objs */
$objs = $mapperQuery->where('id', 0, '>') $objs = $mapperQuery->where('id', 0, '>')
->limit(25)->execute(); ->limit(25)->execute();
$view->setData('news', $objs); $view->data['news'] = $objs;
} }
$ids = []; $ids = [];
@ -103,7 +103,7 @@ final class BackendController extends Controller implements DashboardElementInte
$seen[] = $seenObject->news; $seen[] = $seenObject->news;
} }
$view->setData('seen', $seen); $view->data['seen'] = $seen;
return $view; return $view;
} }
@ -130,7 +130,7 @@ final class BackendController extends Controller implements DashboardElementInte
->limit(5) ->limit(5)
->execute(); ->execute();
$view->addData('news', $news); $view->data['news'] = $news;
return $view; return $view;
} }
@ -195,11 +195,10 @@ final class BackendController extends Controller implements DashboardElementInte
} }
$view->setTemplate('/Modules/News/Theme/Backend/news-single'); $view->setTemplate('/Modules/News/Theme/Backend/news-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response);
$view->addData('news', $article); $view->data['news'] = $article;
$view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( $view->data['editable'] = $this->app->accountManager->get($accountId)->hasPermission(
PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::NEWS, $article->id) PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::NEWS, $article->id);
);
// allow comments // allow comments
if (!$article->comments !== null if (!$article->comments !== null
@ -208,8 +207,8 @@ final class BackendController extends Controller implements DashboardElementInte
$commentCreateView = new \Modules\Comments\Theme\Backend\Components\Comment\CreateView($this->app->l11nManager, $request, $response); $commentCreateView = new \Modules\Comments\Theme\Backend\Components\Comment\CreateView($this->app->l11nManager, $request, $response);
$commentListView = new \Modules\Comments\Theme\Backend\Components\Comment\ListView($this->app->l11nManager, $request, $response); $commentListView = new \Modules\Comments\Theme\Backend\Components\Comment\ListView($this->app->l11nManager, $request, $response);
$view->addData('commentCreate', $commentCreateView); $view->data['commentCreate'] = $commentCreateView;
$view->addData('commentList', $commentListView); $view->data['commentList'] = $commentListView;
} }
return $view; return $view;
@ -232,7 +231,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/news-archive'); $view->setTemplate('/Modules/News/Theme/Backend/news-archive');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response);
$mapperQuery = NewsArticleMapper::getAll() $mapperQuery = NewsArticleMapper::getAll()
->with('createdBy') ->with('createdBy')
@ -244,20 +243,14 @@ final class BackendController extends Controller implements DashboardElementInte
->where('tags/title/language', $response->header->l11n->language); ->where('tags/title/language', $response->header->l11n->language);
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->setData('news', $view->data['news'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<')
$mapperQuery->where('id', $request->getDataInt('id') ?? 0, '<') ->limit(25)->execute();
->limit(25)->execute()
);
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('news', $view->data['news'] = $mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>')
$mapperQuery->where('id', $request->getDataInt('id') ?? 0, '>') ->limit(25)->execute();
->limit(25)->execute()
);
} else { } else {
$view->setData('news', $view->data['news'] = $mapperQuery->where('id', 0, '>')
$mapperQuery->where('id', 0, '>') ->limit(25)->execute();
->limit(25)->execute()
);
} }
return $view; return $view;
@ -280,18 +273,14 @@ 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/news-draft'); $view->setTemplate('/Modules/News/Theme/Backend/news-draft');
$view->addData('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->setData('news', $view->data['news'] = NewsArticleMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '<')->where('status', NewsStatus::DRAFT)->limit(25)->execute();
NewsArticleMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '<')->where('status', NewsStatus::DRAFT)->limit(25)->execute()
);
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('news', $view->data['news'] = NewsArticleMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '>')->where('status', NewsStatus::DRAFT)->limit(25)->execute();
NewsArticleMapper::getAll()->where('id', $request->getDataInt('id') ?? 0, '>')->where('status', NewsStatus::DRAFT)->limit(25)->execute()
);
} else { } else {
$view->setData('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)->execute();
} }
return $view; return $view;
@ -314,16 +303,16 @@ 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/news-create'); $view->setTemplate('/Modules/News/Theme/Backend/news-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor); $view->data['editor'] = $editor;
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accGrpSelector', $accGrpSelector); $view->data['accGrpSelector'] = $accGrpSelector;
$tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response); $tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('tagSelector', $tagSelector); $view->data['tagSelector'] = $tagSelector;
return $view; return $view;
} }
@ -345,18 +334,18 @@ 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/news-create'); $view->setTemplate('/Modules/News/Theme/Backend/news-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response);
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response); $editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->addData('editor', $editor); $view->data['editor'] = $editor;
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response); $accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accGrpSelector', $accGrpSelector); $view->data['accGrpSelector'] = $accGrpSelector;
$tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response); $tagSelector = new \Modules\Tag\Theme\Backend\Components\TagSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('tagSelector', $tagSelector); $view->data['tagSelector'] = $tagSelector;
$view->addData('news', NewsArticleMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute()); $view->data['news'] = NewsArticleMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
return $view; return $view;
} }
@ -378,7 +367,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/news-analysis'); $view->setTemplate('/Modules/News/Theme/Backend/news-analysis');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response)); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000601001, $request, $response);
return $view; return $view;
} }

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

@ -19,7 +19,7 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */
$newsList = $this->getData('news') ?? []; $newsList = $this->data['news'] ?? [];
?> ?>
<div id="news-dashboard" class="col-xs-12 col-md-6" draggable="true"> <div id="news-dashboard" class="col-xs-12 col-md-6" draggable="true">
<div class="portlet"> <div class="portlet">

2
Theme/Backend/news-analysis.tpl.php
View File

@ -14,5 +14,5 @@ declare(strict_types=1);
// @todo: stats: published timeline, published by tags, published by author // @todo: stats: published timeline, published by tags, published by author
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>

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

@ -16,12 +16,12 @@ use phpOMS\Uri\UriFactory;
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
/** @var \Modules\News\Models\NewsArticle[] $newsList */ /** @var \Modules\News\Models\NewsArticle[] $newsList */
$newsList = $this->getData('news') ?? []; $newsList = $this->data['news'] ?? [];
$previous = empty($newsList) ? 'news/archive' : 'news/archive?{?}&id=' . \reset($newsList)->id . '&ptype=p'; $previous = empty($newsList) ? 'news/archive' : 'news/archive?{?}&id=' . \reset($newsList)->id . '&ptype=p';
$next = empty($newsList) ? 'news/archive' : 'news/archive?{?}&id=' . \end($newsList)->id . '&ptype=n'; $next = empty($newsList) ? 'news/archive' : 'news/archive?{?}&id=' . \end($newsList)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">

2
Theme/Backend/news-create.tpl.php
View File

@ -23,7 +23,7 @@ $isNewArticle = $news->id === 0;
$languages = \phpOMS\Localization\ISO639Enum::getConstants(); $languages = \phpOMS\Localization\ISO639Enum::getConstants();
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-9"> <div class="col-xs-12 col-md-9">

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

@ -17,13 +17,13 @@ use phpOMS\Utils\Parser\Markdown\Markdown;
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
/** @var \Modules\News\Models\NewsArticle[] $newsList */ /** @var \Modules\News\Models\NewsArticle[] $newsList */
$newsList = $this->getData('news'); $newsList = $this->data['news'];
$seen = $this->getData('seen') ?? []; $seen = $this->data['seen'] ?? [];
$previous = empty($newsList) ? 'news/dashboard' : 'news/dashboard?{?}&id=' . \reset($newsList)->id . '&ptype=p'; $previous = empty($newsList) ? 'news/dashboard' : 'news/dashboard?{?}&id=' . \reset($newsList)->id . '&ptype=p';
$next = empty($newsList) ? 'news/dashboard' : 'news/dashboard?{?}&id=' . \end($newsList)->id . '&ptype=n'; $next = empty($newsList) ? 'news/dashboard' : 'news/dashboard?{?}&id=' . \end($newsList)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<?php foreach ($newsList as $news) : <?php foreach ($newsList as $news) :

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

@ -16,12 +16,12 @@ use phpOMS\Uri\UriFactory;
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
/** @var \Modules\News\Models\NewsArticle[] $newsList */ /** @var \Modules\News\Models\NewsArticle[] $newsList */
$newsList = $this->getData('news') ?? []; $newsList = $this->data['news'] ?? [];
$previous = empty($newsList) ? 'news/archive' : 'news/archive?{?}&id=' . \reset($newsList)->id . '&ptype=p'; $previous = empty($newsList) ? 'news/archive' : 'news/archive?{?}&id=' . \reset($newsList)->id . '&ptype=p';
$next = empty($newsList) ? 'news/archive' : 'news/archive?{?}&id=' . \end($newsList)->id . '&ptype=n'; $next = empty($newsList) ? 'news/archive' : 'news/archive?{?}&id=' . \end($newsList)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">

6
Theme/Backend/news-single.tpl.php
View File

@ -16,10 +16,10 @@ use Modules\Comments\Models\CommentListStatus;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** @var \Modules\News\Models\NewsArticle $news */ /** @var \Modules\News\Models\NewsArticle $news */
$news = $this->getData('news'); $news = $this->data['news'];
/** @var bool $editable */ /** @var bool $editable */
$editable = $this->getData('editable'); $editable = $this->data['editable'];
/** @var \Modules\Tag\Models\Tag[] $tags */ /** @var \Modules\Tag\Models\Tag[] $tags */
$tags = $news->getTags(); $tags = $news->getTags();
@ -27,7 +27,7 @@ $tags = $news->getTags();
$profile = UriFactory::build('profile/single?{?}&id=' . $news->createdBy->id); $profile = UriFactory::build('profile/single?{?}&id=' . $news->createdBy->id);
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */
echo $this->getData('nav')->render(); ?> echo $this->data['nav']->render(); ?>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<section class="portlet"> <section class="portlet">