[layouts] Fix attribute table filtering not utilising expression context

nyalldawson · nyalldawson · commit de0aedec0472 · 2019-02-28T19:38:34.000+10:00
Fixes #21078
diff --git a/src/core/layout/qgslayoutitemattributetable.cpp b/src/core/layout/qgslayoutitemattributetable.cpp
@@ -411,6 +411,7 @@ bool QgsLayoutItemAttributeTable::getTableContents( QgsLayoutTableContents &cont
     {
       activeFilter = true;
       req.setFilterExpression( mFeatureFilter );
+      req.setExpressionContext( context );
     }
   }
 
diff --git a/tests/src/core/testqgslayouttable.cpp b/tests/src/core/testqgslayouttable.cpp
@@ -241,6 +241,30 @@ void TestQgsLayoutTable::attributeTableFilterFeatures()
 
   //retrieve rows and check
   compareTable( table, expectedRows );
+
+  table->setFeatureFilter( QStringLiteral( "\"Class\"=@airplane_class" ) );
+  table->setFilterFeatures( true );
+  expectedRows.clear();
+  compareTable( table, expectedRows );
+
+  QgsExpressionContextUtils::setLayoutVariable( &l, QStringLiteral( "airplane_class" ), QStringLiteral( "Biplane" ) );
+
+  row.clear();
+  row << QStringLiteral( "Biplane" ) << QStringLiteral( "0" ) << QStringLiteral( "1" ) << QStringLiteral( "3" ) << QStringLiteral( "3" ) << QStringLiteral( "6" );
+  expectedRows.append( row );
+  row.clear();
+  row << QStringLiteral( "Biplane" ) << QStringLiteral( "340" ) << QStringLiteral( "1" ) << QStringLiteral( "3" ) << QStringLiteral( "3" ) << QStringLiteral( "6" );
+  expectedRows.append( row );
+  row.clear();
+  row << QStringLiteral( "Biplane" ) << QStringLiteral( "300" ) << QStringLiteral( "1" ) << QStringLiteral( "3" ) << QStringLiteral( "2" ) << QStringLiteral( "5" );
+  expectedRows.append( row );
+  row.clear();
+  row << QStringLiteral( "Biplane" ) << QStringLiteral( "270" ) << QStringLiteral( "1" ) << QStringLiteral( "3" ) << QStringLiteral( "4" ) << QStringLiteral( "7" );
+  expectedRows.append( row );
+  row.clear();
+  row << QStringLiteral( "Biplane" ) << QStringLiteral( "240" ) << QStringLiteral( "1" ) << QStringLiteral( "3" ) << QStringLiteral( "2" ) << QStringLiteral( "5" );
+  expectedRows.append( row );
+  compareTable( table, expectedRows );
 }
 
 void TestQgsLayoutTable::attributeTableSetAttributes()

Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,7 @@ bool QgsLayoutItemAttributeTable::getTableContents( QgsLayoutTableContents &cont`
`411`	`411`	`{`
`412`	`412`	`activeFilter = true;`
`413`	`413`	`req.setFilterExpression( mFeatureFilter );`
	`414`	`+ req.setExpressionContext( context );`
`414`	`415`	`}`
`415`	`416`	`}`
`416`	`417`