From a7e6d24d82da7f26285acae0538cb13ebfc0d79e Mon Sep 17 00:00:00 2001 From: Torsten Oppermann <torsten@sgalinski.de> Date: Tue, 6 Nov 2018 20:36:17 +0100 Subject: [PATCH] [TASK] Remove extension key option from form finishers --- Classes/Finisher/Forms/FormsFinisher.php | 2 +- Configuration/Yaml/Forms/FinisherSetupBE.yaml | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Classes/Finisher/Forms/FormsFinisher.php b/Classes/Finisher/Forms/FormsFinisher.php index d29c69ec..da5cb879 100644 --- a/Classes/Finisher/Forms/FormsFinisher.php +++ b/Classes/Finisher/Forms/FormsFinisher.php @@ -102,7 +102,7 @@ class FormsFinisher extends AbstractFinisher { $objectManager = GeneralUtility::makeInstance(ObjectManager::class); /** @var \SGalinski\SgMail\Service\MailTemplateService $mailTemplateService */ $mailTemplateService = $objectManager->get( - MailTemplateService::class, $templateName, $this->parseOption('extension'), $markers + MailTemplateService::class, $templateName, 'sg_mail', $markers ); $mailTemplateService->setIgnoreMailQueue($ignoreMailQueue); diff --git a/Configuration/Yaml/Forms/FinisherSetupBE.yaml b/Configuration/Yaml/Forms/FinisherSetupBE.yaml index e03d9d31..8ee16689 100644 --- a/Configuration/Yaml/Forms/FinisherSetupBE.yaml +++ b/Configuration/Yaml/Forms/FinisherSetupBE.yaml @@ -11,7 +11,6 @@ TYPO3: label: 'A Label that seems to be never used...' predefinedDefaults: options: - extension: 'sg_mail' template: '' automaticRegistration: true ignoreMailQueue: true @@ -27,7 +26,6 @@ TYPO3: label: 'A Label that seems to be never used...' predefinedDefaults: options: - extension: 'sg_mail' template: '' automaticRegistration: true ignoreMailQueue: true @@ -60,11 +58,6 @@ TYPO3: 10: 'TYPO3.CMS.Form.mixins.formElementMixins.BaseCollectionEditorsMixin' 100: label: "Mail Templates - E-Mail to the website user" - 110: - identifier: 'extension' - templateName: 'Inspector-TextEditor' - label: 'Extension key' - propertyPath: 'options.extension' 120: identifier: 'template' templateName: 'Inspector-TextEditor' @@ -124,11 +117,6 @@ TYPO3: 10: 'TYPO3.CMS.Form.mixins.formElementMixins.BaseCollectionEditorsMixin' 100: label: "Mail Templates - E-Mail to the website admin" - 110: - identifier: 'extension' - templateName: 'Inspector-TextEditor' - label: 'Extension key' - propertyPath: 'options.extension' 120: identifier: 'template' templateName: 'Inspector-TextEditor' -- GitLab