[processing] Correct order of expression scopes in widget wrapper expression contexts

nyalldawson · nyalldawson · commit 2180b63e3554 · 2019-02-13T07:59:30.000+10:00
diff --git a/src/gui/processing/qgsprocessingwidgetwrapper.cpp b/src/gui/processing/qgsprocessingwidgetwrapper.cpp
@@ -237,9 +237,6 @@ QgsExpressionContext QgsAbstractProcessingParameterWidgetWrapper::createExpressi
 
   QgsExpressionContext c = context->expressionContext();
 
-  if ( linkedVectorLayer() )
-    c << QgsExpressionContextUtils::layerScope( linkedVectorLayer() );
-
   if ( mWidgetContext.model() )
   {
     const QgsProcessingAlgorithm *alg = nullptr;
@@ -259,6 +256,9 @@ QgsExpressionContext QgsAbstractProcessingParameterWidgetWrapper::createExpressi
     c.setHighlightedFunctions( highlightedFunctions );
   }
 
+  if ( linkedVectorLayer() )
+    c << QgsExpressionContextUtils::layerScope( linkedVectorLayer() );
+
   return c;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -237,9 +237,6 @@ QgsExpressionContext QgsAbstractProcessingParameterWidgetWrapper::createExpressi`
`237`	`237`
`238`	`238`	`QgsExpressionContext c = context->expressionContext();`
`239`	`239`
`240`		`- if ( linkedVectorLayer() )`
`241`		`- c << QgsExpressionContextUtils::layerScope( linkedVectorLayer() );`
`242`		`-`
`243`	`240`	`if ( mWidgetContext.model() )`
`244`	`241`	`{`
`245`	`242`	`const QgsProcessingAlgorithm *alg = nullptr;`
`@@ -259,6 +256,9 @@ QgsExpressionContext QgsAbstractProcessingParameterWidgetWrapper::createExpressi`
`259`	`256`	`c.setHighlightedFunctions( highlightedFunctions );`
`260`	`257`	`}`
`261`	`258`
	`259`	`+ if ( linkedVectorLayer() )`
	`260`	`+ c << QgsExpressionContextUtils::layerScope( linkedVectorLayer() );`
	`261`	`+`
`262`	`262`	`return c;`
`263`	`263`	`}`
`264`	`264`