Set missing expression context in some filters

dgoedkoop · nyalldawson · commit fcbf4cb1f1ba · 2018-01-22T10:02:02.000+11:00
In some filters the expression context was not set, so that references to
variables would only work in the preview, but not when actually using them.
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
@@ -137,6 +137,8 @@ int QgsAtlasComposition::updateFeatures()
   // select all features with all attributes
   QgsFeatureRequest req;
 
+  req.setExpressionContext( expressionContext );
+
   std::unique_ptr<QgsExpression> filterExpression;
   if ( mFilterFeatures && !mFeatureFilter.isEmpty() )
   {
diff --git a/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp b/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp
@@ -118,6 +118,8 @@ QgsValueRelationFieldFormatter::ValueRelationCache QgsValueRelationFieldFormatte
   request.setSubsetOfAttributes( QgsAttributeList() << ki << vi );
   if ( !config.value( QStringLiteral( "FilterExpression" ) ).toString().isEmpty() )
   {
+    QgsExpressionContext context( QgsExpressionContextUtils::globalProjectLayerScopes( layer ) );
+    request.setExpressionContext( context );
     request.setFilterExpression( config.value( QStringLiteral( "FilterExpression" ) ).toString() );
   }
 
diff --git a/src/core/layout/qgslayoutatlas.cpp b/src/core/layout/qgslayoutatlas.cpp
@@ -220,6 +220,8 @@ int QgsLayoutAtlas::updateFeatures()
   // select all features with all attributes
   QgsFeatureRequest req;
 
+  req.setExpressionContext( expressionContext );
+
   mFilterParserError.clear();
   if ( mFilterFeatures && !mFilterExpression.isEmpty() )
   {

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,8 @@ int QgsAtlasComposition::updateFeatures()`
`137`	`137`	`// select all features with all attributes`
`138`	`138`	`QgsFeatureRequest req;`
`139`	`139`
	`140`	`+ req.setExpressionContext( expressionContext );`
	`141`	`+`
`140`	`142`	`std::unique_ptr<QgsExpression> filterExpression;`
`141`	`143`	`if ( mFilterFeatures && !mFeatureFilter.isEmpty() )`
`142`	`144`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,8 @@ QgsValueRelationFieldFormatter::ValueRelationCache QgsValueRelationFieldFormatte`
`118`	`118`	`request.setSubsetOfAttributes( QgsAttributeList() << ki << vi );`
`119`	`119`	`if ( !config.value( QStringLiteral( "FilterExpression" ) ).toString().isEmpty() )`
`120`	`120`	`{`
	`121`	`+ QgsExpressionContext context( QgsExpressionContextUtils::globalProjectLayerScopes( layer ) );`
	`122`	`+ request.setExpressionContext( context );`
`121`	`123`	`request.setFilterExpression( config.value( QStringLiteral( "FilterExpression" ) ).toString() );`
`122`	`124`	`}`
`123`	`125`
Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,8 @@ int QgsLayoutAtlas::updateFeatures()`
`220`	`220`	`// select all features with all attributes`
`221`	`221`	`QgsFeatureRequest req;`
`222`	`222`
	`223`	`+ req.setExpressionContext( expressionContext );`
	`224`	`+`
`223`	`225`	`mFilterParserError.clear();`
`224`	`226`	`if ( mFilterFeatures && !mFilterExpression.isEmpty() )`
`225`	`227`	`{`