Fix feature attributes not shown in relation form

(cherry picked from commit be19006)
qgis · Sep 11, 2020 · f069d56 · f069d56
1 parent 493fb2e
commit f069d56
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -297,14 +297,14 @@ void QgsRelationReferenceWidget::setForeignKeys( const QVariantList &values )
   {
     mComboBox->setIdentifierValues( values );
 
-    if ( mChainFilters )
+    if ( mEmbedForm || mChainFilters )
     {
-      QVariant nullValue = QgsApplication::nullRepresentation();
-
       QgsFeatureRequest request = mComboBox->currentFeatureRequest();
-
       mReferencedLayer->getFeatures( request ).nextFeature( mFeature );
-
+    }
+    if ( mChainFilters )
+    {
+      QVariant nullValue = QgsApplication::nullRepresentation();
       const int count = std::min( mFilterComboBoxes.size(), mFilterFields.size() );
       for ( int i = 0; i < count; i++ )
       {