Port attribute actions to expression contexts

nyalldawson · nyalldawson · commit f82c641a3d19 · 2015-08-22T19:01:40.000+10:00
diff --git a/src/core/qgsattributeaction.cpp b/src/core/qgsattributeaction.cpp
@@ -81,7 +81,9 @@ void QgsAttributeAction::doAction( int index, const QgsFeature &feat, const QMap
     return;
 
   // search for expressions while expanding actions
-  QString expandedAction = QgsExpression::replaceExpressionText( action.action(), &feat, mLayer, substitutionMap );
+  QgsExpressionContext context = createExpressionContext();
+  context.setFeature( feat );
+  QString expandedAction = QgsExpression::replaceExpressionText( action.action(), &context, substitutionMap );
   if ( expandedAction.isEmpty() )
     return;
 
@@ -125,6 +127,17 @@ void QgsAttributeAction::runAction( const QgsAction &action, void ( *executePyth
   }
 }
 
+QgsExpressionContext QgsAttributeAction::createExpressionContext() const
+{
+  QgsExpressionContext context;
+  context << QgsExpressionContextUtils::globalScope()
+  << QgsExpressionContextUtils::projectScope();
+  if ( mLayer )
+    context << QgsExpressionContextUtils::layerScope( mLayer );
+
+  return context;
+}
+
 QString QgsAttributeAction::expandAction( QString action, const QgsAttributeMap &attributes,
     uint clickedOnValue )
 {
@@ -215,7 +228,10 @@ QString QgsAttributeAction::expandAction( QString action, QgsFeature &feat, cons
       continue;
     }
 
-    QVariant result = exp.evaluate( &feat, mLayer->fields() );
+    QgsExpressionContext context = createExpressionContext();
+    context.setFeature( feat );
+
+    QVariant result = exp.evaluate( &context );
     if ( exp.hasEvalError() )
     {
       QgsDebugMsg( "Expression parser eval error: " + exp.evalErrorString() );
diff --git a/src/core/qgsattributeaction.h b/src/core/qgsattributeaction.h
@@ -27,7 +27,8 @@
 #include <QString>
 #include <QIcon>
 
-#include <qgsfeature.h>
+#include "qgsfeature.h"
+#include "qgsexpressioncontext.h"
 
 class QDomNode;
 class QDomDocument;
@@ -202,6 +203,8 @@ class  CORE_EXPORT QgsAttributeAction
                     void ( *executePython )( const QString & ) = 0 );
 
     int mDefaultAction;
+
+    QgsExpressionContext createExpressionContext() const;
 };
 
 #endif
