An empty string parameter should not fallback to default value

Since we need to allow empty strings to override defaults in some circumstances
qgis · Aug 13, 2017 · 479106a · 479106a
1 parent d45215e
commit 479106a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/core/processing/qgsprocessingparameters.cpp b/src/core/processing/qgsprocessingparameters.cpp
@@ -41,7 +41,7 @@ QString QgsProcessingParameters::parameterAsString( const QgsProcessingParameter
   if ( val.canConvert<QgsProperty>() )
     return val.value< QgsProperty >().valueAsString( context.expressionContext(), definition->defaultValue().toString() );
 
-  if ( !val.isValid() || val.toString().isEmpty() )
+  if ( !val.isValid() )
   {
     // fall back to default
     val = definition->defaultValue();

diff --git a/tests/src/core/testqgsprocessing.cpp b/tests/src/core/testqgsprocessing.cpp
@@ -2978,6 +2978,8 @@ void TestQgsProcessing::parameterString()
 
   params.insert( "optional",  QVariant() );
   QCOMPARE( QgsProcessingParameters::parameterAsString( def.get(), params, context ), QString( "default" ) );
+  params.insert( "optional",  QString() ); //empty string should not result in default value
+  QCOMPARE( QgsProcessingParameters::parameterAsString( def.get(), params, context ), QString() );
 
   code = def->asScriptCode();
   QCOMPARE( code, QStringLiteral( "##optional=optional string default" ) );