Address PR comments (minor changes)

elpaso · elpaso · commit 3f1ba81b7e97 · 2019-05-27T09:20:34.000+02:00
diff --git a/python/core/auto_generated/fieldformatter/qgsvaluerelationfieldformatter.sip.in b/python/core/auto_generated/fieldformatter/qgsvaluerelationfieldformatter.sip.in
@@ -59,7 +59,7 @@ Constructor for QgsValueRelationFieldFormatter.
 
     static QStringList valueToStringList( const QVariant &value );
 %Docstring
-Utility to convert an array or a string representation of an (C style: {1,2...}) array in the form ``value`` to a string list
+Utility to convert a list or a string representation of an (hstore style: {1,2...}) list in ``value`` to a string list
 
 .. versionadded:: 3.2
 %End
diff --git a/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp b/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp
@@ -168,10 +168,6 @@ QgsValueRelationFieldFormatter::ValueRelationCache QgsValueRelationFieldFormatte
 
 QStringList QgsValueRelationFieldFormatter::valueToStringList( const QVariant &value )
 {
-  // Note: the recommended way to pass a value is QVariant::StringList but
-  //       for back compatibility a string representation either in the form
-  //       of a JSON array or in the form of {"quoted_str", 1, ... } is
-  //       also accepted
   QStringList checkList;
   if ( value.type() == QVariant::StringList )
   {
@@ -183,7 +179,7 @@ QStringList QgsValueRelationFieldFormatter::valueToStringList( const QVariant &v
     auto newVal { value };
     if ( newVal.toString().trimmed().startsWith( '{' ) )
     {
-      newVal = QVariant( newVal.toString().trimmed().mid( 1 ).chopped( 1 ).prepend( '[' ).append( ']' ) );
+      newVal = QVariant( newVal.toString().trimmed().mid( 1 ).mid( 0, newVal.toString().length() - 2 ).prepend( '[' ).append( ']' ) );
     }
     if ( newVal.toString().trimmed().startsWith( '[' ) )
     {
diff --git a/src/core/fieldformatter/qgsvaluerelationfieldformatter.h b/src/core/fieldformatter/qgsvaluerelationfieldformatter.h
@@ -66,7 +66,7 @@ class CORE_EXPORT QgsValueRelationFieldFormatter : public QgsFieldFormatter
     QVariant createCache( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config ) const override;
 
     /**
-     * Utility to convert an array or a string representation of an (C style: {1,2...}) array in the form \a value to a string list
+     * Utility to convert a list or a string representation of an (hstore style: {1,2...}) list in \a value to a string list
      * \since QGIS 3.2
      */
     static QStringList valueToStringList( const QVariant &value );

Original file line number	Diff line number	Diff line change
`@@ -168,10 +168,6 @@ QgsValueRelationFieldFormatter::ValueRelationCache QgsValueRelationFieldFormatte`
`168`	`168`
`169`	`169`	`QStringList QgsValueRelationFieldFormatter::valueToStringList( const QVariant &value )`
`170`	`170`	`{`
`171`		`- // Note: the recommended way to pass a value is QVariant::StringList but`
`172`		`- // for back compatibility a string representation either in the form`
`173`		`- // of a JSON array or in the form of {"quoted_str", 1, ... } is`
`174`		`- // also accepted`
`175`	`171`	`QStringList checkList;`
`176`	`172`	`if ( value.type() == QVariant::StringList )`
`177`	`173`	`{`
`@@ -183,7 +179,7 @@ QStringList QgsValueRelationFieldFormatter::valueToStringList( const QVariant &v`
`183`	`179`	`auto newVal { value };`
`184`	`180`	`if ( newVal.toString().trimmed().startsWith( '{' ) )`
`185`	`181`	`{`
`186`		`- newVal = QVariant( newVal.toString().trimmed().mid( 1 ).chopped( 1 ).prepend( '[' ).append( ']' ) );`
	`182`	`+ newVal = QVariant( newVal.toString().trimmed().mid( 1 ).mid( 0, newVal.toString().length() - 2 ).prepend( '[' ).append( ']' ) );`
`187`	`183`	`}`
`188`	`184`	`if ( newVal.toString().trimmed().startsWith( '[' ) )`
`189`	`185`	`{`