[TASK] Prevent override of existing type or typeicon_column

FriendsOfTYPO3 · Dec 4, 2024 · e92d866 · e92d866
1 parent b2fdf25
commit e92d866
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Classes/Generator/TcaGenerator.php b/Classes/Generator/TcaGenerator.php
@@ -181,8 +181,12 @@ protected function generateTableTca(TableDefinition $tableDefinition, array $bas
                 if ($tableDefinition->hasTypeField()) {
                     // Ensure "type" is always set when a type field exists. This could be missing when an existing
                     // record is extended with a new record type.
-                    $tca['ctrl']['type'] ??= $tableDefinition->getTypeField();
-                    $tca['ctrl']['typeicon_column'] ??= $tableDefinition->getTypeField();
+                    if ($isNewTable || !isset($baseTca[$tableDefinition->getTable()]['ctrl']['type'])) {
+                        $tca['ctrl']['type'] ??= $tableDefinition->getTypeField();
+                    }
+                    if ($isNewTable || !isset($baseTca[$tableDefinition->getTable()]['ctrl']['typeicon_column'])) {
+                        $tca['ctrl']['typeicon_column'] ??= $tableDefinition->getTypeField();
+                    }
                 }
             }
             if ($tableDefinition->getContentType() === ContentType::CONTENT_ELEMENT && $typeDefinition->hasColumn('bodytext')) {