Fix relation editor widget not visible if n:m relation name is empty (#…

…42312) Check relations for equality by Id instead of name and check only if the relation in context is valid.
qgis · Mar 18, 2021 · 4442b48 · 4442b48
1 parent db732fc
commit 4442b48
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -274,17 +274,16 @@ void QgsRelationWidgetWrapper::setNmRelationId( const QVariant &nmRelationId )
 
     // If this widget is already embedded by the same relation, reduce functionality
     const QgsAttributeEditorContext *ctx = &context();
-    do
+    while ( ctx && ctx->relation().isValid() )
     {
-      if ( ( ctx->relation().name() == mRelation.name() && ctx->formMode() == QgsAttributeEditorContext::Embed )
-           || ( mNmRelation.isValid() && ctx->relation().name() == mNmRelation.name() ) )
+      if ( ( ctx->relation().id() == mRelation.id() && ctx->formMode() == QgsAttributeEditorContext::Embed )
+           || ( mNmRelation.isValid() && ctx->relation().id() == mNmRelation.id() ) )
       {
         mWidget->setVisible( false );
         break;
       }
       ctx = ctx->parentContext();
     }
-    while ( ctx );
 
     mWidget->setRelations( mRelation, mNmRelation );
   }