Merge pull request #59707 from qgis/backport-59654-to-release-3_40

[Backport release-3_40] [attribute form] Avoid showing a blank item in the drag and drop form layout for invalid/missing relations
qgis · Dec 3, 2024 · dfe213a · dfe213a
2 parents f3527e7 + d9d1b98
commit dfe213a
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/src/gui/vector/qgsattributesformproperties.cpp b/src/gui/vector/qgsattributesformproperties.cpp
@@ -793,6 +793,7 @@ QgsAttributeEditorElement *QgsAttributesFormProperties::createAttributeEditorWid
     case DnDTreeItemData::Relation:
     {
       const QgsRelation relation = QgsProject::instance()->relationManager()->relation( itemData.name() );
+
       QgsAttributeEditorRelation *relDef = new QgsAttributeEditorRelation( relation, parent );
       const QgsAttributesFormProperties::RelationEditorConfiguration relationEditorConfig = itemData.relationEditorConfiguration();
       relDef->setRelationWidgetTypeId( relationEditorConfig.mRelationWidgetType );
@@ -1157,6 +1158,16 @@ QTreeWidgetItem *QgsAttributesDnDTree::addItem( QTreeWidgetItem *parent, QgsAttr
   newItem->setText( 0, data.displayName() );
   newItem->setIcon( 0, icon );
 
+  if ( data.type() == QgsAttributesFormProperties::DnDTreeItemData::Relation )
+  {
+    const QgsRelation relation = QgsProject::instance()->relationManager()->relation( data.name() );
+    if ( !relation.isValid() || relation.referencedLayer() != mLayer )
+    {
+      newItem->setText( 0, tr( "Invalid relation" ) );
+      newItem->setForeground( 0, QColor( 255, 0, 0 ) );
+    }
+  }
+
   if ( index < 0 )
     parent->addChild( newItem );
   else