From 9fe74ebc8ff4190d2160647f3c47f80de221e2e9 Mon Sep 17 00:00:00 2001 From: Torben Hansen Date: Fri, 31 May 2024 19:35:22 +0200 Subject: [PATCH 1/2] [BUGFIX] Preserve CType group lanels when using `allowed` This change ensures, that item group labels are left out when filtering the `allowed` array of CType items. Closes #149 --- Classes/Form/FormDataProvider/TcaCTypeItems.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Form/FormDataProvider/TcaCTypeItems.php b/Classes/Form/FormDataProvider/TcaCTypeItems.php index 63d20d9..92b35af 100644 --- a/Classes/Form/FormDataProvider/TcaCTypeItems.php +++ b/Classes/Form/FormDataProvider/TcaCTypeItems.php @@ -54,7 +54,7 @@ public function addData(array $result) $result['processedTca']['columns'][$field]['config']['items'] = array_filter( $result['processedTca']['columns'][$field]['config']['items'], function ($item) use ($allowedValues) { - return in_array($item['value'] ?? $item[1], $allowedValues); + return in_array($item['value'] ?? $item[1], $allowedValues) || $item['value'] === '--div--'; } ); } From bd12df51cbaa755c78383ae7ff77fb46040e2369 Mon Sep 17 00:00:00 2001 From: Torben Hansen Date: Fri, 31 May 2024 19:35:22 +0200 Subject: [PATCH 2/2] [BUGFIX] Preserve CType group labels when using `allowed` This change ensures, that item group labels are left out when filtering the `allowed` array of CType items. Closes #149 --- Classes/Form/FormDataProvider/TcaCTypeItems.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Form/FormDataProvider/TcaCTypeItems.php b/Classes/Form/FormDataProvider/TcaCTypeItems.php index 92b35af..54806a3 100644 --- a/Classes/Form/FormDataProvider/TcaCTypeItems.php +++ b/Classes/Form/FormDataProvider/TcaCTypeItems.php @@ -54,7 +54,7 @@ public function addData(array $result) $result['processedTca']['columns'][$field]['config']['items'] = array_filter( $result['processedTca']['columns'][$field]['config']['items'], function ($item) use ($allowedValues) { - return in_array($item['value'] ?? $item[1], $allowedValues) || $item['value'] === '--div--'; + return $item['value'] ?? $item[1] === '--div--' || in_array($item['value'] ?? $item[1], $allowedValues); } ); }