Merge pull request #8478 from elpaso/value-relation-backport

Merge pull request #8464 from elpaso/bugfix-20455-value-relation-mult…

Author: elpaso

src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp

@@ -68,7 +68,7 @@ void QgsEditorWidgetWrapper::setEnabled( bool enabled )
 
 void QgsEditorWidgetWrapper::setFeature( const QgsFeature &feature )
 {
-  mFormFeature = feature;
+  setFormFeature( feature );
   setValue( feature.attribute( mFieldIdx ) );
 }
 

src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp

@@ -212,6 +212,7 @@ void QgsValueRelationWidgetWrapper::widgetValueChanged( const QString &attribute
   // Do nothing if the value has not changed
   if ( attributeChanged )
   {
+    QVariant oldValue( value( ) );
     setFormFeatureAttribute( attribute, newValue );
     // Update combos if the value used in the filter expression has changed
     if ( QgsValueRelationFieldFormatter::expressionRequiresFormScope( mExpression )
@@ -220,6 +221,15 @@ void QgsValueRelationWidgetWrapper::widgetValueChanged( const QString &attribute
       populate();
       // Restore value
       setValue( value( ) );
+      // If the value has changed as a result of another widget's value change,
+      // we need to emit the signal to make sure other dependent widgets are
+      // updated.
+      if ( oldValue != value() && fieldIdx() < formFeature().fields().count() )
+      {
+        QString attributeName( formFeature().fields().names().at( fieldIdx() ) );
+        setFormFeatureAttribute( attributeName, value( ) );
+        emitValueChanged( );
+      }
     }
   }
 }