Fix drill-down filtering on new features.

Fix #46369
qgis · Dec 11, 2021 · d08d2fc · d08d2fc
1 parent 9d5fb80
commit d08d2fc
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp b/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp
@@ -331,7 +331,8 @@ QSet<QString> QgsValueRelationFieldFormatter::expressionParentFormAttributes( co
     QgsExpressionFunction *fd = QgsExpression::QgsExpression::Functions()[f->fnIndex()];
     if ( formFunctions.contains( fd->name( ) ) )
     {
-      for ( const auto &param : f->args( )->list() )
+      const QList<QgsExpressionNode *> cExpressionNodes { f->args( )->list() };
+      for ( const auto &param : std::as_const( cExpressionNodes ) )
       {
         attributes.insert( param->eval( &exp, &context ).toString() );
       }
@@ -355,7 +356,8 @@ QSet<QString> QgsValueRelationFieldFormatter::expressionFormAttributes( const QS
     QgsExpressionFunction *fd = QgsExpression::QgsExpression::Functions()[f->fnIndex()];
     if ( formFunctions.contains( fd->name( ) ) )
     {
-      for ( const auto &param : f->args( )->list() )
+      const QList<QgsExpressionNode *> cExpressionNodes { f->args( )->list() };
+      for ( const auto &param : std::as_const( cExpressionNodes ) )
       {
         attributes.insert( param->eval( &exp, &context ).toString() );
       }
@@ -371,7 +373,7 @@ bool QgsValueRelationFieldFormatter::expressionIsUsable( const QString &expressi
   const QSet<QString> attrs = expressionFormAttributes( expression );
   for ( auto it = attrs.constBegin() ; it != attrs.constEnd(); it++ )
   {
-    if ( ! feature.attribute( *it ).isValid() )
+    if ( feature.fieldNameIndex( *it ) < 0 )
       return false;
   }