Merge pull request #6801 from m-kuhn/relRefIdInsteadOfName

m-kuhn · web-flow · commit e93c97cb9b7c · 2018-04-16T14:21:28.000+02:00
Use relation id instead of name for nesting detection
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp
@@ -76,7 +76,7 @@ void QgsRelationReferenceWidgetWrapper::initWidget( QWidget *editor )
   // If this widget is already embedded by the same relation, reduce functionality
   do
   {
-    if ( ctx->relation().name() == relation.name() )
+    if ( ctx->relation().id() == relation.id() )
     {
       mWidget->setEmbedForm( false );
       mWidget->setReadOnlySelector( true );

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ void QgsRelationReferenceWidgetWrapper::initWidget( QWidget *editor )`
`76`	`76`	`// If this widget is already embedded by the same relation, reduce functionality`
`77`	`77`	`do`
`78`	`78`	`{`
`79`		`- if ( ctx->relation().name() == relation.name() )`
	`79`	`+ if ( ctx->relation().id() == relation.id() )`
`80`	`80`	`{`
`81`	`81`	`mWidget->setEmbedForm( false );`
`82`	`82`	`mWidget->setReadOnlySelector( true );`