From b1902e24750fec25196e9b6e01b03187a0ff7c45 Mon Sep 17 00:00:00 2001
From: Michael Oehlhof <typo3@oehlhof.de>
Date: Thu, 11 Aug 2016 16:05:57 +0200
Subject: [PATCH] [BUGFIX] Correct wrong markup in Template module
This patch brings back the missing labels and text
and removes double form element.
Resolves: #77471
Releases: master
Change-Id: I2f072580ee881c3074f70aaa28168d2fe7f050b3
Reviewed-on: https://review.typo3.org/49455
Tested-by: Bamboo TYPO3com <info@typo3.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Controller/TypoScriptTemplateModuleController.php | 6 ++----
.../Private/{Partials => Templates}/NoTemplate.html | 0
2 files changed, 2 insertions(+), 4 deletions(-)
rename typo3/sysext/tstemplate/Resources/Private/{Partials => Templates}/NoTemplate.html (100%)
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index b2e08efe97e1..b0ec11df6b17 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -483,8 +483,7 @@ class TypoScriptTemplateModuleController extends BaseScriptClass
$previousPage['aHref'] = BackendUtility::getModuleUrl('web_ts', $urlParameters);
$moduleContent['previousPage'] = $previousPage;
}
- $view = $this->getFluidTemplateObject('tstemplate', 'Main');
- $view->assign('partialName', 'NoTemplate');
+ $view = $this->getFluidTemplateObject('tstemplate', 'NoTemplate');
$view->assign('content', $moduleContent);
return $view->render();
}
@@ -674,8 +673,7 @@ page.10.value = HELLO WORLD!
$view = GeneralUtility::makeInstance(StandaloneView::class);
$view->getRenderingContext()->getTemplatePaths()->fillDefaultsByPackageName($extensionName);
$view->getRenderingContext()->setControllerAction($templateName);
- // @TODO: not sure this should stay; this value should in any case be a *proper* extension name!
- $view->getRequest()->setControllerExtensionName('web_ts');
+ $view->getRequest()->setControllerExtensionName('tstemplate');
return $view;
}
diff --git a/typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html b/typo3/sysext/tstemplate/Resources/Private/Templates/NoTemplate.html
similarity index 100%
rename from typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html
rename to typo3/sysext/tstemplate/Resources/Private/Templates/NoTemplate.html
--
GitLab