[BUGFIX] Restore label generation for Form-level element

FluidTYPO3 · Apr 15, 2016 · 41cb134 · 41cb134 · tpinne · Apr 20, 2016
1 parent 27d5d81
commit 41cb134
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/Classes/Form/AbstractFormComponent.php b/Classes/Form/AbstractFormComponent.php
@@ -280,18 +280,13 @@ protected function resolveLocalLanguageValueOfLabel($label, $path = NULL) {
 		} elseif (!empty($label)) {
 			return $label;
 		}
-		$root = $this->getRoot();
-		if (FALSE === $root instanceof Form) {
-			$id = 'form';
-		} else {
-			$id = $root->getName();
+		if ($this instanceof Form) {
+			return $filePrefix . ':flux.form.' . $this->getName();
 		}
+		$root = $this->getRoot();
+		$id = $root->getName();
 		if (empty($path)) {
-			if (!$this instanceof Form) {
-				$path = $this->getPath();
-			} else {
-				$path = '';
-			}
+			$path = $this->getPath();
 		}
 		return $filePrefix . ':' . trim('flux.' . $id . '.' . $path, '.');
 	}

diff --git a/Tests/Unit/Backend/TableConfigurationPostProcessorTest.php b/Tests/Unit/Backend/TableConfigurationPostProcessorTest.php
@@ -46,7 +46,7 @@ public function canCreateTcaFromFluxForm() {
 		$this->assertContains($field, $GLOBALS['TCA'][$table]['interface']['showRecordFieldList']);
 		$this->assertContains($field, $GLOBALS['TCA'][$table]['types'][0]['showitem']);
 		$this->assertEquals($GLOBALS['TCA'][$table]['ctrl']['label'], 'title');
-		$this->assertContains('flux.this_table_does_not_exist', $GLOBALS['TCA'][$table]['ctrl']['title']);
+		$this->assertContains('flux.form.this_table_does_not_exist', $GLOBALS['TCA'][$table]['ctrl']['title']);
 	}
 
 	/**