Ensure QgsFieldMappingModel uses correct source fields when generatin…

…g contexts (cherry picked from commit d255af7)
qgis · Jul 27, 2020 · a193785 · a193785
1 parent 5ef33a5
commit a193785
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/gui/qgsfieldmappingmodel.cpp b/src/gui/qgsfieldmappingmodel.cpp
@@ -310,6 +310,8 @@ QString QgsFieldMappingModel::findExpressionForDestinationField( const QgsFieldM
 void QgsFieldMappingModel::setSourceFields( const QgsFields &sourceFields )
 {
   mSourceFields = sourceFields;
+  if ( mExpressionContextGenerator )
+    mExpressionContextGenerator->setSourceFields( mSourceFields );
   QStringList usedFields;
   beginResetModel();
   for ( const Field &f : qgis::as_const( mMapping ) )
@@ -525,3 +527,8 @@ void QgsFieldMappingModel::ExpressionContextGenerator::setBaseExpressionContextG
 {
   mBaseGenerator = generator;
 }
+
+void QgsFieldMappingModel::ExpressionContextGenerator::setSourceFields( const QgsFields &fields )
+{
+  mSourceFields = fields;
+}
diff --git a/src/gui/qgsfieldmappingmodel.h b/src/gui/qgsfieldmappingmodel.h
@@ -165,12 +165,13 @@ class GUI_EXPORT QgsFieldMappingModel: public QAbstractTableModel
         // QgsExpressionContextGenerator interface
         QgsExpressionContext createExpressionContext() const override;
         void setBaseExpressionContextGenerator( const QgsExpressionContextGenerator *generator );
+        void setSourceFields( const QgsFields &fields );
 
       private:
 
         const QgsExpressionContextGenerator *mBaseGenerator = nullptr;
 
-        const QgsFields mSourceFields;
+        QgsFields mSourceFields;
 
     };