Merge branch 'hotfix/fix_select_dir_at_panel' into 'feature/2.3.0'

Fix direction at panel

See merge request metamodels/attribute_select!107

Author: zonky2

src/Attribute/MetaModelSelect.php

@@ -672,6 +672,7 @@ public function getFilterOptions($idList, $usedOnly, &$arrCount = null)
 
         $strDisplayValue    = $this->getValueColumn();
         $strSortingValue    = $this->getSortingColumn();
+        $sortingDirection   = $this->getSortDirection();
         $strCurrentLanguage = null;
 
         $metaModel = $this->getSelectMetaModel();
@@ -702,7 +703,7 @@ public function getFilterOptions($idList, $usedOnly, &$arrCount = null)
         }
 
         try {
-            $objItems = $metaModel->findByFilter($filter, $strSortingValue);
+            $objItems = $metaModel->findByFilter($filter, $strSortingValue, 0, 0, $sortingDirection);
         } finally {
             if (isset($previousLanguage) && $metaModel instanceof ITranslatedMetaModel) {
                 $metaModel->selectLanguage($previousLanguage);

src/Attribute/Select.php

@@ -235,9 +235,10 @@ public function getFilterOptions($idList, $usedOnly, &$arrCount = null)
             return [];
         }
 
-        $tableName     = $this->getSelectSource();
-        $idColumn      = $this->getIdColumn();
-        $strSortColumn = $this->getSortingColumn();
+        $tableName        = $this->getSelectSource();
+        $idColumn         = $this->getIdColumn();
+        $strSortColumn    = $this->getSortingColumn();
+        $sortingDirection = $this->getSortDirection();
 
         if (null !== $idList) {
             $builder = $this->connection->createQueryBuilder()
@@ -253,7 +254,7 @@ public function getFilterOptions($idList, $usedOnly, &$arrCount = null)
                 ->where('modelTable.id IN (:ids)')
                 ->setParameter('ids', $idList, ArrayParameterType::STRING)
                 ->addGroupBy('sourceTable.' . $idColumn)
-                ->addOrderBy('sourceTable.' . $strSortColumn);
+                ->addOrderBy('sourceTable.' . $strSortColumn, $sortingDirection);
 
             if (false !== ($additionalWhere = $this->getAdditionalWhere())) {
                 $builder->andWhere($additionalWhere);