When we can't auto load a relationship because its definition is

broken, show a warning to users instead of silently failing
qgis · Sep 28, 2022 · 6501df1 · 6501df1
1 parent 765d89c
commit 6501df1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/app/layers/qgsapplayerhandling.cpp b/src/app/layers/qgsapplayerhandling.cpp
@@ -163,7 +163,7 @@ void QgsAppLayerHandling::postProcessAddedLayers( const QList<QgsMapLayer *> &la
             {
               vl->setWeakRelations( relations );
               resolveVectorLayerDependencies( vl, QgsMapLayer::StyleCategory::Relations, QgsVectorLayerRef::MatchType::Source, DependencyFlag::LoadAllRelationships | DependencyFlag::SilentLoad );
-              resolveVectorLayerWeakRelations( vl, QgsVectorLayerRef::MatchType::Source );
+              resolveVectorLayerWeakRelations( vl, QgsVectorLayerRef::MatchType::Source, true );
             }
           }
         }
@@ -1578,7 +1578,7 @@ void QgsAppLayerHandling::resolveVectorLayerDependencies( QgsVectorLayer *vl, Qg
   }
 }
 
-void QgsAppLayerHandling::resolveVectorLayerWeakRelations( QgsVectorLayer *vectorLayer, QgsVectorLayerRef::MatchType matchType )
+void QgsAppLayerHandling::resolveVectorLayerWeakRelations( QgsVectorLayer *vectorLayer, QgsVectorLayerRef::MatchType matchType, bool guiWarnings )
 {
   if ( vectorLayer && vectorLayer->isValid() )
   {
@@ -1601,6 +1601,10 @@ void QgsAppLayerHandling::resolveVectorLayerWeakRelations( QgsVectorLayer *vecto
           }
           QgsProject::instance()->relationManager()->addRelation( relation );
         }
+        else if ( guiWarnings )
+        {
+          QgisApp::instance()->messageBar()->pushWarning( QObject::tr( "Invalid relationship %1" ).arg( relation.name() ), relation.validationError() );
+        }
       }
     }
   }

diff --git a/src/app/layers/qgsapplayerhandling.h b/src/app/layers/qgsapplayerhandling.h
@@ -202,8 +202,11 @@ class APP_EXPORT QgsAppLayerHandling
      *
      * This method will automatically attempt to repair any relations using
      * other layers already present in the current project.
+     *
+     * If \a guiWarnings is TRUE then the explanation for invalid relationships
+     * will be shown to the user.
      */
-    static void resolveVectorLayerWeakRelations( QgsVectorLayer *vectorLayer, QgsVectorLayerRef::MatchType matchType = QgsVectorLayerRef::MatchType::Name );
+    static void resolveVectorLayerWeakRelations( QgsVectorLayer *vectorLayer, QgsVectorLayerRef::MatchType matchType = QgsVectorLayerRef::MatchType::Name, bool guiWarnings = false );
 
     /**
      * Triggered when a vector layer style has changed, checks for widget config layer dependencies