Merge branch 'hotfix/fix_language_for_be_panels' into 'release/2.3.0'

Hotfix/fix language for be panels See merge request metamodels/core!343
MetaModels · Oct 14, 2024 · ee9dc6e · ee9dc6e
2 parents 0e3cd16 + 1dcba53
commit ee9dc6e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/Attribute/TranslatedReference.php b/src/Attribute/TranslatedReference.php
@@ -377,6 +377,7 @@ public function getFilterOptions($idList, $usedOnly, &$arrCount = null)
         while ($objValue = $statement->fetchAssociative()) {
             $arrReturn[$objValue[$arrOptionizer['key']]] = $objValue[$arrOptionizer['value']];
         }
+
         return $arrReturn;
     }
 

diff --git a/src/CoreBundle/EventListener/DcGeneral/DefinitionBuilder/PropertyDefinitionBuilder.php b/src/CoreBundle/EventListener/DcGeneral/DefinitionBuilder/PropertyDefinitionBuilder.php
@@ -340,10 +340,12 @@ private function setExplanation(PropertyInterface $property, array $propInfo): v
      */
     private function setEval(PropertyInterface $property, array $propInfo, bool $isTranslated): void
     {
-        $extra = $propInfo['eval'] ?? [];
+        $extra   = $propInfo['eval'] ?? [];
+        $classes = ($extra['tl_class'] ?? '') . ' ' . ($property->getExtra()['tl_class'] ?? '');
         if ($isTranslated) {
-            $extra['tl_class'] = 'translat-attr' . (!empty($extra['tl_class']) ? ' ' . $extra['tl_class'] : '');
+            $classes .= ' translat-attr';
         }
+        $extra['tl_class'] = \implode(' ', \array_unique(preg_split('#(\s*,*\s*)*,+(\s*,*\s*)*#', $classes)));
 
         $property->setExtra(\array_merge($property->getExtra(), $extra));
     }

diff --git a/src/DcGeneral/Data/Driver.php b/src/DcGeneral/Data/Driver.php
@@ -511,8 +511,10 @@ public function getFilterOptions(ConfigInterface $config)
         $metaModel = $this->getMetaModel();
         assert($metaModel instanceof IMetaModel);
 
+        $backupLanguage = $this->setLanguage($this->getCurrentLanguage());
         $arrValues = $metaModel
             ->getAttributeOptions($arrProperties[0] ?? '', $objFilter);
+        $this->setLanguage($backupLanguage);
 
         $objCollection = new DefaultFilterOptionCollection();
         foreach ($arrValues as $strKey => $strValue) {

diff --git a/src/DcGeneral/Data/FilterBuilder.php b/src/DcGeneral/Data/FilterBuilder.php
@@ -437,12 +437,12 @@ private function buildSearchAttributeFilterRule(IAttribute $attribute, string $v
         $languages = [];
         $metaModel = $attribute->getMetaModel();
         if ($metaModel instanceof ITranslatedMetaModel) {
-            $languages = $metaModel->getLanguages();
+            $languages[] = $metaModel->getLanguage();
         } elseif ($metaModel->isTranslated(false)) {
-            $languages = $this->getMetaModel()->getAvailableLanguages() ?? [];
+            $languages[] = $metaModel->getActiveLanguage();
         }
 
-        return new SearchAttribute($attribute, $value, \array_values(\array_filter($languages)));
+        return new SearchAttribute($attribute, $value, \array_filter($languages));
     }
 
     /** @psalm-assert TFilterANDOR $filter */