[TASk] Display when a template is overwritten

Classes/Controller/MailController.php

@@ -118,16 +118,7 @@ class MailController extends ActionController {
 
 				if (file_exists($defaultTemplateFile)) {
 					$templateFromFile->setContent(file_get_contents($defaultTemplateFile));
-					if (is_array($subject)) {
-						$langSubject = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['subject']['en'];
-
-						if ($registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['subject'][$key] !== '') {
-							$langSubject = $registerArray[$parameters['selectedExtension']][$parameters['selectedTemplate']]['subject'][$key];
-						}
-						$templateFromFile->setSubject($langSubject);
-					} else {
-						$templateFromFile->setSubject($subject);
-					}
+					$templateFromFile->setSubject($subject);
 				} else {
 					// set subject from register array
 					$templateFromFile->setSubject(LocalizationUtility::translate($subject, $this->extensionName));
@@ -138,6 +129,7 @@ class MailController extends ActionController {
 				}
 			} else {
 				$templates[$key] = $template;
+				$template->setIsOverwritten(TRUE);
 			}
 		}
 

Classes/Domain/Model/Template.php

@@ -82,6 +82,11 @@ class Template extends AbstractEntity {
 	 */
 	protected $replyTo = '';
 
+	/**
+	 * @var boolean
+	 */
+	protected $isOverwritten = FALSE;
+
 	/**
 	 * @return string
 	 */
@@ -221,4 +226,18 @@ class Template extends AbstractEntity {
 	public function setReplyTo($replyTo) {
 		$this->replyTo = trim($replyTo);
 	}
+
+	/**
+	 * @return bool
+	 */
+	public function getIsOverwritten() {
+		return $this->isOverwritten;
+	}
+
+	/**
+	 * @param bool $isOverwritten
+	 */
+	public function setIsOverwritten($isOverwritten) {
+		$this->isOverwritten = (bool) $isOverwritten;
+	}
 }

Resources/Private/Language/de.locallang.xlf

@@ -153,6 +153,10 @@
 			<source>From User (overwrites other from fields):</source>
 			<target>Absender Benutzer (hat Vorrang falls gesetzt):</target>
 		</trans-unit>
+		<trans-unit id="backend.is_overwritten" approved="yes">
+			<source>(overwritten)</source>
+			<target>(überschrieben)</target>
+		</trans-unit>
 		<trans-unit id="backend.language_default" approved="yes">
 			<source>Default</source>
 			<target>Standard</target>

Resources/Private/Language/locallang.xlf

@@ -117,6 +117,9 @@
 		<trans-unit id="backend.fromUser">
 			<source>From User (overwrites other from fields):</source>
 		</trans-unit>
+		<trans-unit id="backend.is_overwritten">
+			<source>(overwritten)</source>
+		</trans-unit>
 		<trans-unit id="backend.language_default">
 			<source>Default</source>
 		</trans-unit>

Resources/Private/Templates/Mail/Index.html

@@ -85,12 +85,16 @@
 						<f:form.hidden name="parameters[selectedExtension]" value="{selectedTemplate.extension}" />
 						<f:form.hidden name="parameters[selectedTemplateKey]" value="{selectedTemplateKey}" />
 					</div>
-
 					<f:for each="{languageTemplates}" as="languageTemplate" key="key">
 						<div class="template-col col-md-{colspace}">
 							<f:for each="{languageLabels}" as="label" key="innerKey">
 								<f:if condition="{key} == {innerKey}">
-									<h3>{label}</h3>
+									<h3>
+										{label}
+										<f:if condition="{languageTemplate.isOverwritten}">
+											<f:translate key="backend.is_overwritten" />
+										</f:if>
+									</h3>
 								</f:if>
 							</f:for>