Return default value if value is empty

pblottiere · pblottiere · commit 77d2aaa1e392 · 2019-02-26T08:24:37.000Z
diff --git a/src/server/qgsserverparameters.cpp b/src/server/qgsserverparameters.cpp
@@ -64,7 +64,12 @@ QColor QgsServerParameterDefinition::toColor( bool &ok ) const
 
 QString QgsServerParameterDefinition::toString() const
 {
-  return mValue.toString();
+  QString value = mValue.toString();
+
+  if ( value.isEmpty() )
+    value = mDefaultValue.toString();
+
+  return value;
 }
 
 QStringList QgsServerParameterDefinition::toStringList( const char delimiter ) const

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,12 @@ QColor QgsServerParameterDefinition::toColor( bool &ok ) const`
`64`	`64`
`65`	`65`	`QString QgsServerParameterDefinition::toString() const`
`66`	`66`	`{`
`67`		`- return mValue.toString();`
	`67`	`+ QString value = mValue.toString();`
	`68`	`+`
	`69`	`+ if ( value.isEmpty() )`
	`70`	`+ value = mDefaultValue.toString();`
	`71`	`+`
	`72`	`+ return value;`
`68`	`73`	`}`
`69`	`74`
`70`	`75`	`QStringList QgsServerParameterDefinition::toStringList( const char delimiter ) const`