Skip to content
Snippets Groups Projects
Commit 617fdf7a authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] Mail templates only for root page id

parent 97e74c47
No related branches found
No related tags found
1 merge request!2Feature multiclient
......@@ -81,6 +81,7 @@ class MailController extends ActionController {
$selectedLanguageRight = NULL, $selectedExtensionKey = NULL, $selectedTemplateKey = NULL
) {
$siteRoot = BackendService::getSiteRoot((int) GeneralUtility::_GP('id'));
$siteRootId = $siteRoot['uid'];
if (!($this->session instanceof PhpSession)) {
$this->session = $this->objectManager->get('SGalinski\SgMail\Session\PhpSession');
......@@ -131,10 +132,10 @@ class MailController extends ActionController {
$this->session->setDataByKey('selectedLanguageLeft', $selectedLanguageLeft);
$this->session->setDataByKey('selectedLanguageRight', $selectedLanguageRight);
$templateLeft = $this->templateRepository->findOneByTemplate(
$selectedExtension, $selectedTemplate, $selectedLanguageLeft
$selectedExtension, $selectedTemplate, $selectedLanguageLeft, $siteRootId
);
$templateRight = $this->templateRepository->findOneByTemplate(
$selectedExtension, $selectedTemplate, $selectedLanguageRight
$selectedExtension, $selectedTemplate, $selectedLanguageRight, $siteRootId
);
if ($templateLeft !== NULL) {
......@@ -316,7 +317,7 @@ class MailController extends ActionController {
) {
/** @var Template $template */
$template = $this->templateRepository->findOneByTemplate(
$selectedExtension, $selectedTemplate, $selectedLanguage
$selectedExtension, $selectedTemplate, $selectedLanguage, $siteRootId
);
$templateAlreadyExists = TRUE;
......
......@@ -55,7 +55,7 @@ class MailRepository extends AbstractRepository {
*
* @param string $extensionKey
* @param string $templateName
* @param int siteroot
* @param int $siteroot
* @param int $limit
* @return array|QueryResultInterface
*/
......
......@@ -38,10 +38,11 @@ class TemplateRepository extends AbstractRepository {
* @param string $extensionKey
* @param string $templateName
* @param string $language
* @param int $siteroot
*
* @return Template
*/
public function findOneByTemplate($extensionKey, $templateName, $language) {
public function findOneByTemplate($extensionKey, $templateName, $language, $siteroot = 0) {
$query = $this->createQuery();
$querySettings = $this->objectManager->get(Typo3QuerySettings::class);
......@@ -50,6 +51,7 @@ class TemplateRepository extends AbstractRepository {
$constraintsAnd[] = $query->equals('extension_key', $extensionKey);
$constraintsAnd[] = $query->equals('template_name', $templateName);
$constraintsAnd[] = $query->equals('language', $language);
$constraintsAnd[] = $query->equals('site_root_id', (int) $siteroot);
$query->matching(
$query->logicalAnd($constraintsAnd)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment