[TASK] Fixing small display bug with the templates

Classes/Controller/MailController.php

@@ -122,7 +122,6 @@ class MailController extends ActionController {
 			}
 		}
 
-
 		// calculating optimal column width for the view
 		$colspace = 4;
 		$templateCount = count($templates);
@@ -179,22 +178,13 @@ class MailController extends ActionController {
 	 * @param string $selectedExtension
 	 * @param string $selectedTemplate
 	 * @param string $selectedLanguage
-	 * @param string $selectedContent
-	 * @param string $selectedSubject
-	 * @param string $selectedFromName
-	 * @param string $selectedFromMail
-	 * @param string $selectedCc
-	 * @param string $selectedBcc
-	 * @param string $selectedReplyTo
+	 * @param array $templateData
 	 * @return Template $template
 	 * @throws \InvalidArgumentException
 	 * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException
 	 * @throws \TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException
 	 */
-	private function saveTemplate(
-		$selectedExtension, $selectedTemplate, $selectedLanguage, $selectedContent, $selectedSubject,
-		$selectedFromName, $selectedFromMail, $selectedCc, $selectedBcc, $selectedReplyTo
-	) {
+	private function saveTemplate($selectedExtension, $selectedTemplate, $selectedLanguage, $templateData) {
 		$pid = (int) GeneralUtility::_GP('id');
 
 		/** @var Template $template */
@@ -212,13 +202,13 @@ class MailController extends ActionController {
 		$template->setExtensionKey($selectedExtension);
 		$template->setTemplateName($selectedTemplate);
 		$template->setLanguage($selectedLanguage);
-		$template->setContent($selectedContent);
-		$template->setSubject($selectedSubject);
-		$template->setFromName($selectedFromName);
-		$template->setFromMail($selectedFromMail);
-		$template->setCc($selectedCc);
-		$template->setBcc($selectedBcc);
-		$template->setReplyTo($selectedReplyTo);
+		$template->setContent($templateData['content']);
+		$template->setSubject($templateData['subject']);
+		$template->setFromName($templateData['fromName']);
+		$template->setFromMail($templateData['fromMail']);
+		$template->setCc($templateData['cc']);
+		$template->setBcc($templateData['bcc']);
+		$template->setReplyTo($templateData['replyTo']);
 
 		if ($templateAlreadyExists) {
 			$this->templateRepository->update($template);
@@ -242,12 +232,7 @@ class MailController extends ActionController {
 	 */
 	public function sendTestMailAction(array $parameters = []) {
 		foreach ($parameters['templates'] as $key => $template) {
-			$this->saveTemplate(
-				$parameters['selectedExtension'], $parameters['selectedTemplate'], $key,
-				$template['content'], $template['subject'],
-				$template['fromName'], $template['fromMail'], $template['cc'], $template['bcc'],
-				$template['replyTo']
-			);
+			$this->saveTemplate($parameters['selectedExtension'], $parameters['selectedTemplate'], $key, $template);
 		}
 
 		$objectManager = GeneralUtility::makeInstance(ObjectManager::class);
@@ -290,13 +275,12 @@ class MailController extends ActionController {
 	 *
 	 * @param string $template
 	 * @param string $extensionKey
-	 * @param string $language
 	 * @throws \InvalidArgumentException
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\UnsupportedRequestTypeException
 	 */
-	public function resetAction($template, $extensionKey, $language = '') {
-		$this->templateRepository->deleteTemplate($extensionKey, $template, $language);
+	public function resetAction($template, $extensionKey) {
+		$this->templateRepository->deleteTemplate($extensionKey, $template);
 
 		$message = LocalizationUtility::translate('backend.template_reset', 'sg_mail');
 		$this->addFlashMessage($message, '', FlashMessage::OK);

Classes/Domain/Repository/TemplateRepository.php

@@ -67,18 +67,15 @@ class TemplateRepository extends AbstractRepository {
 	 *
 	 * @param $extensionKey
 	 * @param $templateName
-	 * @param $language
 	 */
-	public function deleteTemplate($extensionKey, $templateName, $language) {
+	public function deleteTemplate($extensionKey, $templateName) {
 		/** @var $databaseConnection DatabaseConnection */
 		$databaseConnection = $GLOBALS['TYPO3_DB'];
 
 		$tableName = 'tx_sgmail_domain_model_template';
 		$where = 'extension_key = ' . $databaseConnection->fullQuoteStr($extensionKey, $tableName);
 		$where.= ' AND template_name = ' . $databaseConnection->fullQuoteStr($templateName, $tableName);
-		if ($language !== '') {
-			$where.= ' AND language = ' . $databaseConnection->fullQuoteStr($language, $tableName);
-		}
+
 		$databaseConnection->exec_DELETEquery($tableName, $where);
 	}
 }

Resources/Private/Templates/Mail/Index.html

@@ -108,11 +108,11 @@
 								</div>
 								<div class="row form-group">
 									<label for="parameters[templates][{key}][replyTo]" class="">{f:translate(key:'backend.replyTo')}</label>
-									<f:form.textfield type="text" class="form-control" value="{languageTemplate.replyToLeft}" name="parameters[templates][{key}][replyTo]" />
+									<f:form.textfield type="text" class="form-control" value="{languageTemplate.replyTo}" name="parameters[templates][{key}][replyTo]" />
 								</div>
 								<div class="row form-group">
 									<label for="parameters[templates][{key}][subject]" class="">{f:translate(key:'backend.subject')}</label>
-									<f:form.textfield type="text" class="form-control" value="{languageTemplate.subjectLeft}" name="parameters[templates][{key}][subject]" />
+									<f:form.textfield type="text" class="form-control" value="{languageTemplate.subject}" name="parameters[templates][{key}][subject]" />
 								</div>
 								<div class="row form-group">
 									<label for="parameters[templates][{key}][content]" class="">{f:translate(key:'backend.content')}</label>