[processing] Fix QStringList values are not accepted as valid values …

…for multi field parameters
qgis · Jan 30, 2020 · abcb8d2 · abcb8d2
1 parent 9bcd980
commit abcb8d2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/core/processing/qgsprocessingparameters.cpp b/src/core/processing/qgsprocessingparameters.cpp
@@ -1524,6 +1524,10 @@ QStringList QgsProcessingParameters::parameterAsFields( const QgsProcessingParam
       for ( const QVariant &var : constToList )
         resultStringList << var.toString();
     }
+    else if ( val.type() == QVariant::StringList )
+    {
+      resultStringList = val.toStringList();
+    }
     else
       resultStringList.append( val.toString().split( ';' ) );
   }
@@ -1540,6 +1544,10 @@ QStringList QgsProcessingParameters::parameterAsFields( const QgsProcessingParam
         for ( const QVariant &var : constToList )
           resultStringList << var.toString();
       }
+      else if ( definition->defaultValue().type() == QVariant::StringList )
+      {
+        resultStringList = definition->defaultValue().toStringList();
+      }
       else
         resultStringList.append( definition->defaultValue().toString().split( ';' ) );
     }

diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp
@@ -4913,6 +4913,18 @@ void TestQgsProcessing::parameterField()
   fields = QgsProcessingParameters::parameterAsFields( def.get(), params, context );
   QCOMPARE( fields, QStringList() << "def" );
 
+  // optional with string list default
+  def.reset( new QgsProcessingParameterField( "optional", QString(), QStringList() << QStringLiteral( "def" ) << QStringLiteral( "abc" ), QString(), QgsProcessingParameterField::Any, true, true ) );
+  QVERIFY( def->checkValueIsAcceptable( QStringList() << "a" << "b" ) );
+  fields = QgsProcessingParameters::parameterAsFields( def.get(), params, context );
+  QCOMPARE( fields, QStringList() << "def" << "abc" );
+  params.insert( "optional",  QVariantList() << "f" << "h" );
+  fields = QgsProcessingParameters::parameterAsFields( def.get(), params, context );
+  QCOMPARE( fields, QStringList() << "f" << "h" );
+  params.insert( "optional",  QStringList() << "g" << "h" );
+  fields = QgsProcessingParameters::parameterAsFields( def.get(), params, context );
+  QCOMPARE( fields, QStringList() << "g" << "h" );
+
   // optional, no default
   def.reset( new QgsProcessingParameterField( "optional", QString(), QVariant(), QString(), QgsProcessingParameterField::Any, false, true ) );
   params.insert( "optional",  QVariant() );