Fix issue #1073

Table headings are now also populated even if the attribute is not
contained within the input screen but only in the render settings
(column layout only)

Author: discordier

src/MetaModels/ContaoIntegration/Boot.php

@@ -123,12 +123,13 @@ function (PreCreateDcGeneralEvent $event) use ($metaModelName, $viewCombinations
                         return;
                     }
 
-                    $inputScreen = $viewCombinations->getInputScreenDetails($metaModelName);
+                    $inputScreen   = $viewCombinations->getInputScreenDetails($metaModelName);
+                    $renderSetting = $viewCombinations->getRenderSetting($metaModelName);
 
                     $factory->setContainerClassName('MetaModels\DcGeneral\DataDefinition\MetaModelDataDefinition');
 
                     $dispatcher = $container->getEventDispatcher();
-                    $generator  = new Builder($container, $inputScreen);
+                    $generator  = new Builder($container, $inputScreen, $renderSetting);
 
                     $dispatcher->addListener(
                         BuildDataDefinitionEvent::NAME,

src/MetaModels/DcGeneral/Dca/Builder/Builder.php

@@ -128,12 +128,15 @@ class Builder
      * @param IMetaModelsServiceContainer $serviceContainer The name of the MetaModel being created.
      *
      * @param IInputScreen                $inputScreen      The input screen to use.
+     *
+     * @param int                         $renderSetting    The render setting.
      */
-    public function __construct($serviceContainer, $inputScreen)
+    public function __construct($serviceContainer, $inputScreen, $renderSetting)
     {
         $this->serviceContainer = $serviceContainer;
         $this->inputScreen      = $inputScreen;
         $this->translator       = new StaticTranslator();
+        $this->renderSetting    = $renderSetting;
     }
 
     /**
@@ -1113,11 +1116,14 @@ protected function parseListLabel(IMetaModelDataDefinition $container, ListingCo
         } else {
             $formatter = $listing->getLabelFormatter($providerName);
         }
-
+        $renderSetting = $this->serviceContainer->getRenderSettingFactory()->createCollection(
+            $this->getMetaModel(),
+            $this->renderSetting
+        );
         $formatter->setPropertyNames(
             array_merge(
                 $formatter->getPropertyNames(),
-                $container->getPropertiesDefinition()->getPropertyNames()
+                $renderSetting->getSettingNames()
             )
         );
 
@@ -1349,7 +1355,7 @@ protected function buildPropertyFromDca(
         $metaModel = $this->getMetaModel();
         $attribute = $metaModel->getAttribute($propName);
 
-        if (!$attribute || !$propInfo) {
+        if (!$attribute) {
             return;
         }
 
@@ -1362,16 +1368,20 @@ protected function buildPropertyFromDca(
             $definition->addProperty($property);
         }
 
-        if (!$property->getLabel() && isset($propInfo['label'])) {
-            $lang = $propInfo['label'];
+        if (!$property->getLabel()) {
+            if (isset($propInfo['label'])) {
+                $lang = $propInfo['label'];
 
-            if (is_array($lang)) {
-                $label       = reset($lang);
-                $description = next($lang);
+                if (is_array($lang)) {
+                    $label       = reset($lang);
+                    $description = next($lang);
 
-                $property->setDescription($description);
+                    $property->setDescription($description);
+                } else {
+                    $label = $lang;
+                }
             } else {
-                $label = $lang;
+                $label = $attribute->getName();
             }
 
             $property->setLabel($label);