[layouts] Fix item_variables function with non-lowercase item ids

Fixes #19063
qgis · Jun 8, 2018 · 57c442a · 57c442a
1 parent 262a01f
commit 57c442a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp
@@ -677,7 +677,7 @@ class GetLayoutItemVariables : public QgsScopedExpressionFunction
       if ( !mLayout )
         return QVariant();
 
-      QString id = values.at( 0 ).toString().toLower();
+      QString id = values.at( 0 ).toString();
 
       const QgsLayoutItem *item = mLayout->itemById( id );
       if ( !item )

diff --git a/tests/src/core/testqgslayoutitem.cpp b/tests/src/core/testqgslayoutitem.cpp
@@ -1403,7 +1403,7 @@ void TestQgsLayoutItem::itemVariablesFunction()
   QgsRectangle extent( 2000, 2800, 2500, 2900 );
   QgsLayout l( QgsProject::instance() );
 
-  QgsExpression e( QStringLiteral( "map_get( item_variables( 'map_id' ), 'map_scale' )" ) );
+  QgsExpression e( QStringLiteral( "map_get( item_variables( 'Map_id' ), 'map_scale' )" ) );
   // no map
   QgsExpressionContext c = l.createExpressionContext();
   QVariant r = e.evaluate( &c );
@@ -1414,21 +1414,21 @@ void TestQgsLayoutItem::itemVariablesFunction()
   map->attemptSetSceneRect( QRectF( 30, 60, 200, 100 ) );
   map->setExtent( extent );
   l.addLayoutItem( map );
-  map->setId( QStringLiteral( "map_id" ) );
+  map->setId( QStringLiteral( "Map_id" ) );
 
   c = l.createExpressionContext();
   r = e.evaluate( &c );
   QGSCOMPARENEAR( r.toDouble(), 184764103, 100 );
 
-  QgsExpression e2( QStringLiteral( "map_get( item_variables( 'map_id' ), 'map_crs' )" ) );
+  QgsExpression e2( QStringLiteral( "map_get( item_variables( 'Map_id' ), 'map_crs' )" ) );
   r = e2.evaluate( &c );
   QCOMPARE( r.toString(), QString( "EPSG:4326" ) );
 
-  QgsExpression e3( QStringLiteral( "map_get( item_variables( 'map_id' ), 'map_crs_definition' )" ) );
+  QgsExpression e3( QStringLiteral( "map_get( item_variables( 'Map_id' ), 'map_crs_definition' )" ) );
   r = e3.evaluate( &c );
   QCOMPARE( r.toString(), QString( "+proj=longlat +datum=WGS84 +no_defs" ) );
 
-  QgsExpression e4( QStringLiteral( "map_get( item_variables( 'map_id' ), 'map_units' )" ) );
+  QgsExpression e4( QStringLiteral( "map_get( item_variables( 'Map_id' ), 'map_units' )" ) );
   r = e4.evaluate( &c );
   QCOMPARE( r.toString(), QString( "degrees" ) );
 }