Merge pull request #8620 from m-kuhn/backport-validation-reenable-lay…

…er-savability Save layer changes on successful repair
qgis · Dec 6, 2018 · 7f5afe6 · 7f5afe6
2 parents d9d4bd2 + bf0ad45
commit 7f5afe6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7018,7 +7018,6 @@ void QgisApp::commitError( QgsVectorLayer *vlayer )
   const QStringList commitErrors = vlayer->commitErrors();
   if ( !vlayer->allowCommit() && commitErrors.empty() )
   {
-    QgsMessageLog::logMessage( tr( "Could not save changes. Geometry validation failed." ) );
     return;
   }
 

diff --git a/src/app/qgsgeometryvalidationservice.cpp b/src/app/qgsgeometryvalidationservice.cpp
@@ -145,7 +145,7 @@ void QgsGeometryValidationService::onFeatureDeleted( QgsVectorLayer *layer, QgsF
 
 void QgsGeometryValidationService::onBeforeCommitChanges( QgsVectorLayer *layer )
 {
-  if ( !mLayerChecks[layer].topologyChecks.empty() ) // TODO && topologyChecks not fulfilled
+  if ( !mBypassChecks && !mLayerChecks[layer].topologyChecks.empty() )
   {
     if ( !layer->allowCommit() )
     {
@@ -461,7 +461,9 @@ void QgsGeometryValidationService::triggerTopologyChecks( QgsVectorLayer *layer
     }
     if ( allErrors.empty() && mLayerChecks[layer].singleFeatureCheckErrors.empty() && mLayerChecks[layer].commitPending )
     {
+      mBypassChecks = true;
       layer->commitChanges();
+      mBypassChecks = false;
       mMessageBar->popWidget( mMessageBarItem );
       mMessageBarItem = nullptr;
     }

diff --git a/src/app/qgsgeometryvalidationservice.h b/src/app/qgsgeometryvalidationservice.h
@@ -122,6 +122,10 @@ class QgsGeometryValidationService : public QObject
     QgsMessageBar *mMessageBar = nullptr;
     QgsMessageBarItem *mMessageBarItem = nullptr;
 
+    // when checks do complete successfully and changes need to be saved
+    // this variable is used to indicate that it's safe to bypass the checks
+    bool mBypassChecks = false;
+
 };
 
 #endif // QGSGEOMETRYVALIDATIONSERVICE_H