Merge pull request #4843 from 3liz/backport-4841-to-release_3_7

[Backport release_3_7] Fix Relation Reference Form control OrderByValue default value to true
3liz · Oct 4, 2024 · bf84b32 · bf84b32
2 parents d66902e + d4acd0a
commit bf84b32
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/lizmap/modules/lizmap/lib/Form/QgisForm.php b/lizmap/modules/lizmap/lib/Form/QgisForm.php
@@ -1761,6 +1761,8 @@ protected function PerformWfsRequest($wfsRequest, $formControl, $referencedField
             }
 
             // orderByValue
+            // orderByValue has been removed from XML since QGIS 3.32
+            // TODO Remove check orderByValue and keep asort when QGIS 3.32 will be the minimum version for allowing a QGIS project
             if ($formControl->relationReferenceData['orderByValue']) {
                 asort($data);
             }

diff --git a/lizmap/modules/lizmap/lib/Form/QgisFormControlProperties.php b/lizmap/modules/lizmap/lib/Form/QgisFormControlProperties.php
@@ -127,6 +127,18 @@ public function getEditAttributes()
         return $this->attributes;
     }
 
+    /**
+     * @param string $attrName
+     *
+     * @return bool
+     */
+    public function hasEditAttribute($attrName)
+    {
+        $lowerName = strtolower($attrName);
+
+        return isset($this->attributes[$attrName]) || isset($this->attributeLowerNames[$lowerName]);
+    }
+
     /**
      * @param string $attrName
      *
@@ -206,9 +218,10 @@ public function getValueRelationData()
 
     public function getRelationReference()
     {
+        // TODO Remove orderByValue when QGIS 3.32 will be the minimum version for allowing a QGIS project
         return array(
             'allowNull' => $this->getEditAttribute('AllowNull'),
-            'orderByValue' => $this->getEditAttribute('OrderByValue'),
+            'orderByValue' => $this->hasEditAttribute('OrderByValue') ? $this->getEditAttribute('OrderByValue') : true, // OrderByValue has been removed from XML since QGIS 3.32
             'relation' => $this->getEditAttribute('Relation'),
             'mapIdentification' => $this->getEditAttribute('MapIdentification'),
             'filters' => $this->getEditAttribute('filters'),