[processing] Fix missing fields in data defined expression builder

when input layer is using selected features only Fixes #40055
qgis · Jul 19, 2021 · 3164ede · 3164ede
1 parent 5566654
commit 3164ede
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/gui/processing/qgsprocessingwidgetwrapper.cpp b/src/gui/processing/qgsprocessingwidgetwrapper.cpp
@@ -331,7 +331,15 @@ void QgsAbstractProcessingParameterWidgetWrapper::setDynamicParentLayerParameter
       context = tmpContext.get();
     }
 
-    QgsVectorLayer *layer = QgsProcessingParameters::parameterAsVectorLayer( parentWrapper->parameterDefinition(), parentWrapper->parameterValue(), *context );
+    QVariant val = parentWrapper->parameterValue();
+    if ( val.canConvert<QgsProcessingFeatureSourceDefinition>() )
+    {
+      // input is a QgsProcessingFeatureSourceDefinition - get extra properties from it
+      QgsProcessingFeatureSourceDefinition fromVar = qvariant_cast<QgsProcessingFeatureSourceDefinition>( val );
+      val = fromVar.source;
+    }
+
+    QgsVectorLayer *layer = QgsProcessingParameters::parameterAsVectorLayer( parentWrapper->parameterDefinition(), val, *context );
     if ( !layer )
     {
       mPropertyButton->setVectorLayer( nullptr );