From c67266ad5a313e8cb93f8dfba46b541c525ceb5f Mon Sep 17 00:00:00 2001
From: Oliver Bartsch <bo@cedev.de>
Date: Thu, 19 Jan 2023 11:52:36 +0100
Subject: [PATCH] [BUGFIX] Use origin module identifier on creating new TS
template
Resolves: #99636
Releases: main
Change-Id: Ibe663ca3c85693e90b14a6c6e9c1432f4a1812f5
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/77494
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../tstemplate/Classes/Controller/ConstantEditorController.php | 1 +
.../tstemplate/Classes/Controller/InfoModifyController.php | 1 +
.../tstemplate/Resources/Private/Partials/NoTemplate.html | 2 +-
.../Resources/Private/Templates/ConstantEditorNoTemplate.html | 2 +-
.../Resources/Private/Templates/InfoModifyNoTemplate.html | 2 +-
5 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/tstemplate/Classes/Controller/ConstantEditorController.php b/typo3/sysext/tstemplate/Classes/Controller/ConstantEditorController.php
index e4c351a4ba12..8356b9ae60c3 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/ConstantEditorController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/ConstantEditorController.php
@@ -273,6 +273,7 @@ class ConstantEditorController extends AbstractTemplateModuleController
$view->makeDocHeaderModuleMenu(['id' => $pageUid]);
$view->assignMultiple([
'pageUid' => $pageUid,
+ 'moduleIdentifier' => $currentModuleIdentifier,
'previousPage' => $this->getClosestAncestorPageWithTemplateRecord($pageUid),
]);
return $view->renderResponse('ConstantEditorNoTemplate');
diff --git a/typo3/sysext/tstemplate/Classes/Controller/InfoModifyController.php b/typo3/sysext/tstemplate/Classes/Controller/InfoModifyController.php
index 7f1d3f361f47..5ee55faf39e0 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/InfoModifyController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/InfoModifyController.php
@@ -79,6 +79,7 @@ class InfoModifyController extends AbstractTemplateModuleController
$view->makeDocHeaderModuleMenu(['id' => $pageUid]);
$view->assignMultiple([
'pageUid' => $pageUid,
+ 'moduleIdentifier' => $currentModuleIdentifier,
'previousPage' => $this->getClosestAncestorPageWithTemplateRecord($pageUid),
]);
return $view->renderResponse('InfoModifyNoTemplate');
diff --git a/typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html b/typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html
index a373b5e23ae1..8dfc3bd656d4 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Partials/NoTemplate.html
@@ -42,7 +42,7 @@
<div class="card-text">
<p><f:translate key="LLL:EXT:tstemplate/Resources/Private/Language/locallang.xml:newWebsiteDescription" /></p>
<div>
- <form action="{f:be.uri(route: 'web_ts', parameters: '{id: pageUid}')}" method="post">
+ <form action="{f:be.uri(route: moduleIdentifier, parameters: '{id: pageUid}')}" method="post">
<input type="hidden" name="action" value="createNewWebsiteTemplate" />
<input
class="btn btn-primary"
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorNoTemplate.html b/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorNoTemplate.html
index 09617b1be711..a07d4753af4b 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorNoTemplate.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/ConstantEditorNoTemplate.html
@@ -13,7 +13,7 @@
arguments="{
pageUid: pageUid,
previousPage: previousPage,
- moduleIdentifier: 'web_typoscript_constanteditor'
+ moduleIdentifier: moduleIdentifier
}"
/>
diff --git a/typo3/sysext/tstemplate/Resources/Private/Templates/InfoModifyNoTemplate.html b/typo3/sysext/tstemplate/Resources/Private/Templates/InfoModifyNoTemplate.html
index ce8c60644823..1da4080d9628 100644
--- a/typo3/sysext/tstemplate/Resources/Private/Templates/InfoModifyNoTemplate.html
+++ b/typo3/sysext/tstemplate/Resources/Private/Templates/InfoModifyNoTemplate.html
@@ -13,7 +13,7 @@
arguments="{
pageUid: pageUid,
previousPage: previousPage,
- moduleIdentifier: 'web_typoscript_infomodify'
+ moduleIdentifier: moduleIdentifier
}"
/>
--
GitLab