Merge pull request #45408 from 3nids/polyrel-set-expression-layer

[polymorphic relation] set the layer of the expression widget
qgis · Oct 6, 2021 · e49f393 · e49f393
2 parents 498c523 + 207a13f
commit e49f393
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/app/qgsrelationaddpolymorphicdialog.cpp b/src/app/qgsrelationaddpolymorphicdialog.cpp
@@ -87,6 +87,7 @@ void QgsRelationAddPolymorphicDialog::setPolymorphicRelation( const QgsPolymorph
   mReferencingLayerComboBox->setLayer( polyRel.referencingLayer() );
   mReferencedLayerFieldComboBox->setLayer( polyRel.referencingLayer() );
   mReferencedLayerFieldComboBox->setField( polyRel.referencedLayerField() );
+  mReferencedLayerExpressionWidget->setLayer( polyRel.referencingLayer() );
   mReferencedLayerExpressionWidget->setExpression( polyRel.referencedLayerExpression() );
   mRelationStrengthComboBox->setCurrentIndex( mRelationStrengthComboBox->findData( polyRel.strength() ) );
 
@@ -280,6 +281,7 @@ void QgsRelationAddPolymorphicDialog::updateReferencingFieldsComboBoxes()
 void QgsRelationAddPolymorphicDialog::updateReferencedLayerFieldComboBox()
 {
   mReferencedLayerFieldComboBox->setLayer( mReferencingLayerComboBox->currentLayer() );
+  mReferencedLayerExpressionWidget->setLayer( mReferencingLayerComboBox->currentLayer() );
 }
 
 void QgsRelationAddPolymorphicDialog::referencedLayersChanged()