Skip to content
Snippets Groups Projects
Verified Commit 1db644be authored by Kevin Ditscheid's avatar Kevin Ditscheid
Browse files

[BUGFIX] Fix backend module

parent b9f3e41a
No related branches found
No related tags found
1 merge request!48[TASK] Require TYPO3 12
Hide whitespace changes
Inline Side-by-side
Showing
with 106 additions and 104 deletions
Classes/Controller/BackendController.php
+ 35
− 34
View file @ 1db644be
......@@ -26,18 +26,20 @@
namespace SGalinski\SgJobs\Controller;
use Doctrine\DBAL\Exception;
use Psr\Http\Message\ResponseInterface;
use SGalinski\SgJobs\Domain\Repository\CompanyRepository;
use SGalinski\SgJobs\Domain\Repository\JobRepository;
use SGalinski\SgJobs\Pagination\Pagination;
use SGalinski\SgJobs\Service\BackendService;
use TYPO3\CMS\Backend\Template\Components\DocHeaderComponent;
use TYPO3\CMS\Backend\Template\ModuleTemplate;
use TYPO3\CMS\Backend\Template\ModuleTemplateFactory;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Type\ContextualFeedbackSeverity;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Mvc\Exception\NoSuchArgumentException;
use TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
use TYPO3\CMS\Extbase\Utility\LocalizationUtility;
......@@ -51,36 +53,43 @@ class BackendController extends ActionController {
*
* @var DocHeaderComponent
*/
protected $docHeaderComponent;
protected DocHeaderComponent $docHeaderComponent;
/**
* @var CompanyRepository
*
*/
protected $companyRepository;
protected CompanyRepository $companyRepository;
/**
* @var JobRepository
*
*/
protected $jobRepository;
protected JobRepository $jobRepository;
/**
* Inject the CompanyRepository
*
* @param CompanyRepository $companyRepository
* @var ModuleTemplateFactory
*/
public function injectCompanyRepository(CompanyRepository $companyRepository): void {
$this->companyRepository = $companyRepository;
}
protected ModuleTemplateFactory $moduleTemplateFactory;
/**
* Inject the JobRepository
*
* @param JobRepository $jobRepository
* @var ModuleTemplate
*/
public function injectJobRepository(JobRepository $jobRepository): void {
protected ModuleTemplate $moduleTemplate;
public function __construct(
CompanyRepository $companyRepository,
JobRepository $jobRepository,
ModuleTemplateFactory $moduleTemplateFactory
) {
$this->companyRepository = $companyRepository;
$this->jobRepository = $jobRepository;
$this->moduleTemplateFactory = $moduleTemplateFactory;
}
public function initializeAction(): void {
parent::initializeAction();
$this->moduleTemplate = $this->moduleTemplateFactory->create($this->request);
}
/**
......@@ -89,10 +98,11 @@ class BackendController extends ActionController {
* @param array $filters
* @param int $currentPage
* @return ResponseInterface
* @throws InvalidQueryException|NoSuchArgumentException
* @throws InvalidQueryException
* @throws Exception
*/
public function indexAction(array $filters = [], int $currentPage = 1): ResponseInterface {
$pageUid = (int) $this->request->getQueryParams()['id'];
$pageUid = $this->request->getQueryParams()['id'] ?? 0;
$itemsPerPage = 10;
/** @var BackendUserAuthentication $backendUser */
$backendUser = $GLOBALS['BE_USER'];
......@@ -111,25 +121,25 @@ class BackendController extends ActionController {
$this->docHeaderComponent = GeneralUtility::makeInstance(DocHeaderComponent::class);
$this->docHeaderComponent->setMetaInformation($pageInfo);
BackendService::makeButtons($this->docHeaderComponent, $this->request);
$this->view->assign('docHeader', $this->docHeaderComponent->docHeaderContent());
$this->moduleTemplate->assign('docHeader', $this->docHeaderComponent->docHeaderContent());
$this->view->assign('pageUid', $pageUid);
$this->view->assign('pages', BackendService::getPagesWithJobRecords());
$this->moduleTemplate->assign('pageUid', $pageUid);
$this->moduleTemplate->assign('pages', BackendService::getPagesWithJobRecords());
$jobsQueryResult = $this->jobRepository->findBackendJobs($pageUid, $filters, $itemsPerPage);
$pagination = GeneralUtility::makeInstance(Pagination::class, $jobsQueryResult, $currentPage, $itemsPerPage);
$this->view->assign('pagination', $pagination);
$this->moduleTemplate->assign('pagination', $pagination);
$totalJobCount = $pagination->getTotalItems();
$this->view->assign('totalJobCount', $totalJobCount);
$this->moduleTemplate->assign('totalJobCount', $totalJobCount);
// get all Locations
/** @noinspection PhpUndefinedMethodInspection */
/** @var QueryResultInterface $companies */
$companies = $this->companyRepository->findByPid($pageUid);
$this->view->assign('locationOptions', $companies);
$this->moduleTemplate->assign('locationOptions', $companies);
$this->view->assign('isAdmin', $GLOBALS['BE_USER']->isAdmin());
$this->view->assign('filters', $filters);
$this->moduleTemplate->assign('isAdmin', $GLOBALS['BE_USER']->isAdmin());
$this->moduleTemplate->assign('filters', $filters);
if (!$totalJobCount && $pageUid) {
$this->addFlashMessage(
LocalizationUtility::translate('backend.notice.noRecords', 'SgJobs'),
......@@ -138,15 +148,6 @@ class BackendController extends ActionController {
);
}
return $this->createBackendResponse();
}
/**
* Use the ModuleTemplateResponse to create a response object for the backend
*
* @return ResponseInterface
*/
protected function createBackendResponse(): ResponseInterface {
return $this->htmlResponse($this->view->render());
return $this->moduleTemplate->renderResponse('Index');
}
}
Classes/Service/BackendService.php
+ 9
− 4
View file @ 1db644be
......@@ -50,12 +50,17 @@ class BackendService {
*/
public static function getPages(): array {
$out = [];
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('pages');
$queryBuilder->getRestrictions()->removeAll()->add(GeneralUtility::makeInstance(DeletedRestriction::class));
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
->getQueryBuilderForTable('pages');
$queryBuilder->getRestrictions()->removeAll()
->add(GeneralUtility::makeInstance(DeletedRestriction::class));
$rows = $queryBuilder->select('*')
->from('pages')
->where(
$queryBuilder->expr()->eq('is_siteroot', $queryBuilder->createNamedParameter(1, \PDO::PARAM_INT))
$queryBuilder->expr()->eq(
'is_siteroot',
$queryBuilder->createNamedParameter(1, \PDO::PARAM_INT)
)
)->executeQuery()->fetchAllAssociative();
foreach ($rows as $row) {
......@@ -85,7 +90,6 @@ class BackendService {
* @throws \UnexpectedValueException
*/
public static function makeButtons($docHeaderComponent, $request): void {
/** @var ButtonBar $buttonBar */
$buttonBar = $docHeaderComponent->getButtonBar();
/** @var IconFactory $iconFactory */
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
......@@ -104,6 +108,7 @@ class BackendService {
// shortcut button
$shortcutButton = $buttonBar->makeShortcutButton()
->setDisplayName('Shortcut')
->setRouteIdentifier($request->getPluginName())
->setArguments(
[
......
Classes/ViewHelpers/Backend/ControlViewHelper.php
+ 1
− 2
View file @ 1db644be
......@@ -65,6 +65,7 @@ class ControlViewHelper extends AbstractViewHelper {
$GLOBALS['LANG']->includeLLFile('EXT:core/Resources/Private/Language/locallang_mod_web_list.xlf');
$databaseRecordList = GeneralUtility::makeInstance(DatabaseRecordList::class);
$databaseRecordList->setRequest($this->renderingContext->getRequest());
$pageInfo = BackendUtility::readPageAccess($row['pid'], $GLOBALS['BE_USER']->getPagePermsClause(1));
$databaseRecordList->calcPerms = new Permission(
$GLOBALS['BE_USER']->calcPerms($pageInfo)
......@@ -73,8 +74,6 @@ class ControlViewHelper extends AbstractViewHelper {
$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
$pageRenderer->loadJavaScriptModule('@typo3/backend/ajax-data-handler.js');
$pageRenderer->addInlineLanguageLabelFile('EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf');
$languageService = GeneralUtility::makeInstance(LanguageService::class);
$languageService->includeLLFile('EXT:backend/Resources/Private/Language/locallang_alt_doc.xlf');
// DatabaseRecordList has a $prevPrevUid, which might track back a page. We won't do that, 1st+last record are
// not sortable in one direction
......
Resources/Private/Backend/Layouts/Default.html deleted 100644 → 0
+ 0
− 52
View file @ b9f3e41a
{namespace core = TYPO3\CMS\Core\ViewHelpers}
{namespace sg=SGalinski\SgJobs\ViewHelpers}
<f:be.container
includeCssFiles="{0: '{f:uri.resource(path: \'StyleSheets/backend.css\')}'}"
includeRequireJsModules="{
0: 'TYPO3/CMS/Backend/ContextMenu',
1: 'TYPO3/CMS/Backend/Tooltip',
2: 'TYPO3/CMS/SgJobs/Backend/SgJobs'}">
<div class="module" data-module-id="" data-module-name="">
<div class="module-docheader t3js-module-docheader">
<div
class="module-docheader-bar module-docheader-bar-navigation t3js-module-docheader-bar t3js-module-docheader-bar-navigation">
<div class="module-docheader-bar-column-left">
</div>
<div class="module-docheader-bar-column-right">
<span class="typo3-docheader-pagePath">
<f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path"/>: <f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
</span>
<f:format.raw>{docHeader.metaInformation.recordInformation}</f:format.raw>
</div>
</div>
<div
class="module-docheader-bar module-docheader-bar-buttons t3js-module-docheader-bar t3js-module-docheader-bar-buttons">
<div class="module-docheader-bar-column-left">
<div class="btn-toolbar" role="toolbar" aria-label="">
<f:render section="iconButtons"/>
</div>
</div>
<div class="module-docheader-bar-column-right">
<f:render partial="ButtonBar" arguments="{buttons:docHeader.buttons.right}"/>
</div>
</div>
</div>
<f:if condition="{V11}">
<f:then>
<div class="module-body t3js-module-body">
</f:then>
<f:else>
<div id="typo3-docbody">
</f:else>
</f:if>
<div id="typo3-inner-docbody">
<h1>
<f:render section="headline"/>
</h1>
<f:render section="main"/>
</div>
</div>
</div>
</f:be.container>
Resources/Private/Backend/Partials/Error.html deleted 100644 → 0
+ 0
− 3
View file @ b9f3e41a
<div class="alert alert-danger">
<strong>Error:</strong> <f:translate key="backend.message.error" />
</div>
\ No newline at end of file
Resources/Private/Layouts/Backend.html 0 → 100644
+ 45
− 0
View file @ 1db644be
{namespace core = TYPO3\CMS\Core\ViewHelpers}
{namespace sg=SGalinski\SgJobs\ViewHelpers}
<f:be.pageRenderer
includeCssFiles="{0: '{f:uri.resource(path: \'StyleSheets/backend.css\')}'}"
includeRequireJsModules="{
0: 'TYPO3/CMS/Backend/ContextMenu',
1: 'TYPO3/CMS/Backend/Tooltip',
2: 'TYPO3/CMS/SgJobs/Backend/SgJobs'
}" />
<div class="module" data-module-id="" data-module-name="">
<div class="module-docheader t3js-module-docheader">
<div
class="module-docheader-bar module-docheader-bar-navigation t3js-module-docheader-bar t3js-module-docheader-bar-navigation">
<div class="module-docheader-bar-column-left">
</div>
<div class="module-docheader-bar-column-right">
<span class="typo3-docheader-pagePath">
<f:translate key="LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:labels.path"/>:
<f:format.raw>{docHeader.metaInformation.path}</f:format.raw>
</span>
<f:format.raw>{docHeader.metaInformation.recordInformation}</f:format.raw>
</div>
</div>
<div
class="module-docheader-bar module-docheader-bar-buttons t3js-module-docheader-bar t3js-module-docheader-bar-buttons">
<div class="module-docheader-bar-column-left">
<div class="btn-toolbar" role="toolbar" aria-label="">
<f:render section="iconButtons"/>
</div>
</div>
<div class="module-docheader-bar-column-right">
<f:render partial="Backend/ButtonBar" arguments="{buttons:docHeader.buttons.right}"/>
</div>
</div>
</div>
<div class="module-body t3js-module-body">
<div id="typo3-inner-docbody">
<h1>
<f:render section="headline"/>
</h1>
<f:render section="main"/>
</div>
</div>
</div>
Resources/Private/Backend/Partials/Filter.html → Resources/Private/Partials/Backend/Filter.html
+ 10
− 3
View file @ 1db644be
{namespace be=TYPO3\CMS\Backend\ViewHelpers}
<f:form action="index" controller="Backend" method="post" objectName="filters" object="{filters}">
<f:form action="index" controller="Backend" method="post" objectName="filters">
<div class="row">
<div class="col-xs-6 col-6 col-sm-6">
<div class="form-group">
<label for="filter-locations">
<f:translate key="backend.filters.locations" />
</label>
<f:form.select class="form-control" multiple="1" size="4" property="locations" optionLabelField="name" optionValueField="city" options="{locationOptions}" id="filter-locations" />
<f:form.select class="form-control"
multiple="1"
size="4"
property="locations"
optionLabelField="name"
optionValueField="city"
options="{locationOptions}"
id="filter-locations" />
<small>
<f:format.raw><f:translate key="backend.filters.locations.description" /></f:format.raw>
</small>
......@@ -30,6 +38,5 @@
</f:form.button>
</div>
</div>
</div>
</f:form>
Resources/Private/Backend/Templates/Index.html → Resources/Private/Templates/Backend/Index.html
+ 6
− 6
View file @ 1db644be
{namespace sg=SGalinski\SgJobs\ViewHelpers}
{namespace be=TYPO3\CMS\Backend\ViewHelpers}
<f:layout name="Default"/>
<f:layout name="Backend"/>
<f:section name="iconButtons">
</f:section>
......@@ -14,8 +14,8 @@
<f:flashMessages />
<f:if condition="{pageUid}">
<f:then>
<f:render partial="Filter" arguments="{_all}"/>
<f:render partial="CreateJob" arguments="{_all}"/>
<f:render partial="Backend/Filter" arguments="{_all}"/>
<f:render partial="Backend/CreateJob" arguments="{_all}"/>
<p>
<f:translate key="backend.message.sorting"/>
......@@ -34,7 +34,7 @@
<thead>
<tr>
<td class="bg-light" colspan="3">
<f:render partial="Pagination" arguments="{pagination: pagination}"/>
<f:render partial="Backend/Pagination" arguments="{pagination: pagination}"/>
</td>
</tr>
</thead>
......@@ -67,9 +67,9 @@
</f:if>
</f:then>
<f:else>
<f:render partial="SelectRoot" arguments="{pages: pages}"/>
<f:render partial="Backend/SelectRoot" arguments="{pages: pages}"/>
<f:if condition="{isAdmin}">
<f:render partial="CreateJob" arguments="{pageUid: pageUid}"/>
<f:render partial="Backend/CreateJob" arguments="{pageUid: pageUid}"/>
</f:if>
</f:else>
</f:if>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment