Merge pull request #3678 from neos/bugfix/adds-dimension-grouping

ahaeslich · web-flow · commit 316f4983c1aa · 2023-12-21T17:05:58.000+01:00
BUGFIX: Adds group for dimension configuration
diff --git a/Classes/Fusion/Helper/ContentDimensionsHelper.php b/Classes/Fusion/Helper/ContentDimensionsHelper.php
@@ -56,7 +56,8 @@ public function contentDimensionsByName(ContentRepositoryId $contentRepositoryId
                 $result[$dimension->id->value]['presets'][$value->value] = [
                     // TODO: name, uriSegment!
                     'values' => [$value->value],
-                    'label' => $value->getConfigurationValue('label')
+                    'label' => $value->getConfigurationValue('label'),
+                    'group' => $value->getConfigurationValue('group'),
                 ];
             }
         }
diff --git a/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.Test.OneDimension/Configuration/Settings.yaml b/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.Test.OneDimension/Configuration/Settings.yaml
@@ -9,19 +9,26 @@ Neos:
             values:
               'en_US':
                 label: English (US)
+                group: NON-EU
                 specializations:
                   'en_UK':
+                    group: NON-EU
                     label: English (UK)
               'de':
                 label: German
+                group: EU
                 specializations:
                   'nl':
+                    group: EU
                     label: Dutch
               'fr':
+                group: EU
                 label: French
               'da':
+                group: EU
                 label: Danish
               'lv':
+                group: EU
                 label: Latvian
   Neos:
     sites:

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,8 @@ public function contentDimensionsByName(ContentRepositoryId $contentRepositoryId`
`56`	`56`	`$result[$dimension->id->value]['presets'][$value->value] = [`
`57`	`57`	`// TODO: name, uriSegment!`
`58`	`58`	`'values' => [$value->value],`
`59`		`- 'label' => $value->getConfigurationValue('label')`
	`59`	`+ 'label' => $value->getConfigurationValue('label'),`
	`60`	`+ 'group' => $value->getConfigurationValue('group'),`
`60`	`61`	`];`
`61`	`62`	`}`
`62`	`63`	`}`