From b395e408740fe81a3a878bfab3bb5d983239152c Mon Sep 17 00:00:00 2001
From: Torsten Oppermann <torsten@sgalinski.de>
Date: Mon, 20 Nov 2017 15:04:44 +0100
Subject: [PATCH] [TASK] Refactoring be module
---
Classes/Controller/BackendController.php | 7 ++++---
Classes/Service/BackendService.php | 2 +-
Resources/Private/Templates/Backend/Index.html | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
index 50ff171b..935c66fd 100644
--- a/Classes/Controller/BackendController.php
+++ b/Classes/Controller/BackendController.php
@@ -87,8 +87,10 @@ class BackendController extends ActionController {
BackendService::makeButtons($this->docHeaderComponent, $this->request);
$this->view->assign('docHeader', $this->docHeaderComponent->docHeaderContent());
+ list($totalJobCount, $jobs) = BackendService::getJobsByPid($pageUid, $filters);
+ debug($totalJobCount);
// when we are on a siteroot page then display the normal view
- if ($pageInfo && (int) $pageInfo['is_siteroot'] === 1) {
+ if ($totalJobCount) {
// get all jobs
/** @var ObjectStorage $jobs */
$jobs = $this->jobRepository->findJobs($this->rootPageUid, $filters);
@@ -111,8 +113,7 @@ class BackendController extends ActionController {
$this->view->assign('rootPageUid', $this->rootPageUid);
$this->view->assign('typo3Version', VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version));
} else {
- $this->view->assign('pages', BackendService::getPages());
- $this->view->assign('rootOptions', BackendService::getRootOptions());
+ $this->view->assign('pages', BackendService::getPagesWithJobRecords());
}
} catch (\Exception $exception) {
diff --git a/Classes/Service/BackendService.php b/Classes/Service/BackendService.php
index ef093979..220e7fcc 100644
--- a/Classes/Service/BackendService.php
+++ b/Classes/Service/BackendService.php
@@ -216,7 +216,7 @@ class BackendService {
* @return array
* @throws \InvalidArgumentException
*/
- public static function getUsersByPid($pid, array $filters = []): array {
+ public static function getJobsByPid($pid, array $filters = []): array {
$pid = (int) $pid;
$tableName = 'fe_users';
/** @var $databaseConnection DatabaseConnection */
diff --git a/Resources/Private/Templates/Backend/Index.html b/Resources/Private/Templates/Backend/Index.html
index 9b9eb148..6b5f0ba1 100644
--- a/Resources/Private/Templates/Backend/Index.html
+++ b/Resources/Private/Templates/Backend/Index.html
@@ -13,7 +13,7 @@
<f:then>
<f:if condition="{pages}">
<f:then>
- <f:render partial="SelectRoot" arguments="{pages: rootOptions}" />
+ <f:render partial="SelectRoot" arguments="{pages: pages}" />
</f:then>
<f:else>
<f:render partial="Filter" arguments="{filters: filters, locationOptions: locationOptions}" />
--
GitLab