From f069d56728970716ae4780d3864a3e4fa4889e30 Mon Sep 17 00:00:00 2001
From: Marco Hugentobler <marco.hugentobler@sourcepole.ch>
Date: Thu, 13 Aug 2020 09:45:42 +0200
Subject: [PATCH] Fix feature attributes not shown in relation form

(cherry picked from commit be190062215ba2b97eb5ea09f10bf178f14d9957)
---
 src/gui/editorwidgets/qgsrelationreferencewidget.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
index 9c78cfdc4fdd..306f47cfcb72 100644
--- 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++ )
       {