From 928c481c8425419d3913c07313b7a697c987214b Mon Sep 17 00:00:00 2001 From: Armin Vieweg Date: Wed, 21 Feb 2018 10:52:09 +0100 Subject: [PATCH] [BUGFIX] Fix wrong type in "rootLevel" option Several system tables used a wrong type for ctrl option "rootLevel" in TCA. By definition in TCAref "rootLevel" is from type integer. Resolves: #83990 Branches: master Change-Id: Ic49464ce428a1d9a928f90231c77e0d445789ee7 Reviewed-on: https://review.typo3.org/55852 Tested-by: TYPO3com Reviewed-by: Oliver Klee Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn Reviewed-by: Georg Ringer Tested-by: Georg Ringer --- .../Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php | 4 ++-- typo3/sysext/core/Configuration/TCA/sys_file.php | 2 +- typo3/sysext/core/Configuration/TCA/sys_file_metadata.php | 2 +- typo3/sysext/core/Configuration/TCA/sys_file_storage.php | 2 +- typo3/sysext/core/Configuration/TCA/sys_history.php | 2 +- typo3/sysext/core/Configuration/TCA/sys_log.php | 2 +- typo3/sysext/core/Configuration/TCA/sys_news.php | 2 +- .../TCA/tx_extensionmanager_domain_model_extension.php | 2 +- .../TCA/tx_extensionmanager_domain_model_repository.php | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php index 42da7bb3653d..beb3181c8a56 100644 --- a/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php +++ b/typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php @@ -491,7 +491,7 @@ class TcaSelectItemsTest extends UnitTestCase 'fooTable' => [ 'ctrl' => [ 'title' => 'fooTableTitle', - 'rootLevel' => true, + 'rootLevel' => 1, 'security' => [ 'ignoreRootLevelRestriction' => true, ], @@ -526,7 +526,7 @@ class TcaSelectItemsTest extends UnitTestCase 'fooTable' => [ 'ctrl' => [ 'title' => 'fooTableTitle', - 'rootLevel' => true, + 'rootLevel' => 1, ], 'columns' => [ 'bar' => [ diff --git a/typo3/sysext/core/Configuration/TCA/sys_file.php b/typo3/sysext/core/Configuration/TCA/sys_file.php index 298b74b321ba..34e4e68f56c2 100644 --- a/typo3/sysext/core/Configuration/TCA/sys_file.php +++ b/typo3/sysext/core/Configuration/TCA/sys_file.php @@ -6,7 +6,7 @@ return [ 'tstamp' => 'tstamp', 'type' => 'type', 'hideTable' => true, - 'rootLevel' => true, + 'rootLevel' => 1, 'default_sortby' => 'name ASC', 'typeicon_column' => 'type', 'typeicon_classes' => [ diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php b/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php index 78e06a99db02..35d542602241 100644 --- a/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php +++ b/typo3/sysext/core/Configuration/TCA/sys_file_metadata.php @@ -8,7 +8,7 @@ return [ 'cruser_id' => 'cruser_id', 'type' => 'file:type', 'hideTable' => true, - 'rootLevel' => true, + 'rootLevel' => 1, 'languageField' => 'sys_language_uid', 'transOrigPointerField' => 'l10n_parent', 'transOrigDiffSourceField' => 'l10n_diffsource', diff --git a/typo3/sysext/core/Configuration/TCA/sys_file_storage.php b/typo3/sysext/core/Configuration/TCA/sys_file_storage.php index a63280630435..b3d9f5895460 100644 --- a/typo3/sysext/core/Configuration/TCA/sys_file_storage.php +++ b/typo3/sysext/core/Configuration/TCA/sys_file_storage.php @@ -9,7 +9,7 @@ return [ 'default_sortby' => 'name', 'delete' => 'deleted', 'descriptionColumn' => 'description', - 'rootLevel' => true, + 'rootLevel' => 1, 'versioningWS_alwaysAllowLiveEdit' => true, // Only have LIVE records of file storages 'enablecolumns' => [], 'typeicon_classes' => [ diff --git a/typo3/sysext/core/Configuration/TCA/sys_history.php b/typo3/sysext/core/Configuration/TCA/sys_history.php index d27fbeb8ceca..03f8472339f3 100644 --- a/typo3/sysext/core/Configuration/TCA/sys_history.php +++ b/typo3/sysext/core/Configuration/TCA/sys_history.php @@ -5,7 +5,7 @@ return [ 'label' => 'tablename', 'tstamp' => 'tstamp', 'adminOnly' => true, - 'rootLevel' => true, + 'rootLevel' => 1, 'hideTable' => true, 'default_sortby' => 'uid DESC', ], diff --git a/typo3/sysext/core/Configuration/TCA/sys_log.php b/typo3/sysext/core/Configuration/TCA/sys_log.php index 5f8758cfb74b..dc4234d8684c 100644 --- a/typo3/sysext/core/Configuration/TCA/sys_log.php +++ b/typo3/sysext/core/Configuration/TCA/sys_log.php @@ -5,7 +5,7 @@ return [ 'label' => 'details', 'tstamp' => 'tstamp', 'adminOnly' => true, - 'rootLevel' => true, + 'rootLevel' => 1, 'hideTable' => true, 'default_sortby' => 'uid DESC', ], diff --git a/typo3/sysext/core/Configuration/TCA/sys_news.php b/typo3/sysext/core/Configuration/TCA/sys_news.php index 68c4a3042063..27faa49ba5cd 100644 --- a/typo3/sysext/core/Configuration/TCA/sys_news.php +++ b/typo3/sysext/core/Configuration/TCA/sys_news.php @@ -7,7 +7,7 @@ return [ 'crdate' => 'crdate', 'cruser_id' => 'cruser_id', 'adminOnly' => true, - 'rootLevel' => true, + 'rootLevel' => 1, 'delete' => 'deleted', 'enablecolumns' => [ 'disabled' => 'hidden', diff --git a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php index f168052853bc..fef6df8d85ba 100644 --- a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php +++ b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_extension.php @@ -5,7 +5,7 @@ return [ 'label' => 'uid', 'default_sortby' => '', 'hideTable' => true, - 'rootLevel' => true, + 'rootLevel' => 1, 'adminOnly' => true, 'typeicon_classes' => [ 'default' => 'empty-icon' diff --git a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php index b854e10ca160..ed16a81558fa 100644 --- a/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php +++ b/typo3/sysext/extensionmanager/Configuration/TCA/tx_extensionmanager_domain_model_repository.php @@ -5,7 +5,7 @@ return [ 'label' => 'uid', 'default_sortby' => '', 'hideTable' => true, - 'rootLevel' => true, + 'rootLevel' => 1, 'adminOnly' => true, 'typeicon_classes' => [ 'default' => 'empty-icon' -- 2.20.1