Merge pull request #5109 from 3liz/backport-5093-to-release_3_8

[Backport release_3_8] [Bugfix] Edition : exec a DELETE can return 0 in some cases
3liz · Dec 11, 2024 · 2788e87 · 2788e87
2 parents d751102 + dc18723
commit 2788e87
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/lizmap/modules/lizmap/classes/qgisVectorLayer.class.php b/lizmap/modules/lizmap/classes/qgisVectorLayer.class.php
@@ -956,9 +956,11 @@ public function updateFeature($feature, $values, $loginFilteredLayers)
      *                                                - attribute: filter attribute from the layer
      * @param null|jDbConnection $connection          DBConnection, if not null then the parameter conneciton is used, default value null
      *
-     * @return int
+     * @return bool|int the number of affected rows. False if the query has failed.
      *
      * @throws Exception
+     *
+     * @see jDbConnection::exec() Launch a SQL Query (update, delete..) which doesn't return rows.
      */
     public function deleteFeature($feature, $loginFilteredLayers, $connection = null)
     {

diff --git a/lizmap/modules/lizmap/controllers/edition.classic.php b/lizmap/modules/lizmap/controllers/edition.classic.php
@@ -1161,7 +1161,7 @@ public function deleteFeature()
                 $feature = $this->featureData->features[0];
                 $rs = $qgisForm->deleteFromDb($feature, $cnx);
 
-                if ($rs) {
+                if ($rs !== false) {
                     jMessage::add(jLocale::get('view~edition.message.success.delete'), 'success');
                     $eventParams['deleteFiles'] = $deleteFiles;
                     $eventParams['success'] = true;

diff --git a/lizmap/modules/lizmap/lib/Form/QgisForm.php b/lizmap/modules/lizmap/lib/Form/QgisForm.php
@@ -1291,6 +1291,12 @@ protected function processWebDavUploadFile($form, $ref)
      *
      * @param mixed               $feature
      * @param null|\jDbConnection $cnx     DBConnection, passed along QGISVectorLayer deleteFeature method
+     *
+     * @return bool|int the number of affected rows. False if the query has failed.
+     *
+     * @throws \Exception
+     *
+     * @see \jDbConnection::exec() Launch a SQL Query (update, delete..) which doesn't return rows.
      */
     public function deleteFromDb($feature, $cnx = null)
     {
@@ -1316,7 +1322,7 @@ public function deleteFromDb($feature, $cnx = null)
             return 1;
         }
         if ($event->allResponsesByKeyAreFalse('cancelDelete') === false) {
-            return 0;
+            return false;
         }
         $result = $this->layer->deleteFeature($feature, $loginFilteredLayers, $cnx);
         $this->appContext->eventNotify('LizmapEditionFeaturePostDelete', $eventParams);