From cb4a7b1a76d72796f4c7d28770faa3dfc18e135c Mon Sep 17 00:00:00 2001
From: Mathias Schreiber <mathias.schreiber@wmdb.de>
Date: Thu, 8 Oct 2015 22:45:57 +0200
Subject: [PATCH] [BUGFIX] Remove duplicate docheader in Web->Info->Log
Releases: master
Resolves: #70513
Change-Id: I36bd4f211a7cfe6f0f714dbfe50486097f664b09
Reviewed-on: http://review.typo3.org/43916
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Daniel Goerz <ervaude@gmail.com>
Tested-by: Daniel Goerz <ervaude@gmail.com>
---
.../Classes/Controller/AbstractController.php | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/typo3/sysext/belog/Classes/Controller/AbstractController.php b/typo3/sysext/belog/Classes/Controller/AbstractController.php
index 572d66da9053..d7d56bedef0a 100644
--- a/typo3/sysext/belog/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/belog/Classes/Controller/AbstractController.php
@@ -83,13 +83,6 @@ abstract class AbstractController extends ActionController {
*/
protected $view;
- /**
- * BackendTemplateView Container
- *
- * @var BackendTemplateView
- */
- protected $defaultViewObjectName = BackendTemplateView::class;
-
/**
* @param \TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository $logEntryRepository
*/
@@ -104,10 +97,11 @@ abstract class AbstractController extends ActionController {
* @return void
*/
protected function initializeView(ViewInterface $view) {
- /** @var BackendTemplateView $view */
- parent::initializeView($view);
- $view->getModuleTemplate()->getPageRenderer()->loadExtJS();
- $view->getModuleTemplate()->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Backend/DateTimePicker');
+ if ($view instanceof BackendTemplateView) {
+ parent::initializeView($view);
+ $view->getModuleTemplate()->getPageRenderer()->loadExtJS();
+ $view->getModuleTemplate()->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Backend/DateTimePicker');
+ }
}
/**
@@ -115,6 +109,9 @@ abstract class AbstractController extends ActionController {
* @return void
*/
public function initializeAction() {
+ if ($this->isInPageContext === FALSE) {
+ $this->defaultViewObjectName = BackendTemplateView::class;
+ }
}
/**
--
GitLab