JSON formatting and prefix removal

qgis · Aug 23, 2018 · 40d0dfa315048e80bbbefb632c639313691086d4 · 40d0dfa
1 parent 4fecc2e
commit 40d0dfa315048e80bbbefb632c639313691086d4
Unified Split

Showing with 3 additions and 3 deletions.

+3 −3 src/core/expression/qgsexpression.cpp
diff --git a/src/core/expression/qgsexpression.cpp b/src/core/expression/qgsexpression.cpp
@@ -912,15 +912,15 @@ QString QgsExpression::formatPreviewString( const QVariant &value )
       if ( separator.isEmpty() )
         separator = QStringLiteral( ", " );
 
-      mapStr.append( it.key() ).append( ": " ).append( formatPreviewString( it.value() ) );
+      mapStr.append( QStringLiteral( "\"%1\": %2" ).arg( it.key(), formatPreviewString( it.value() ) ) );
       if ( mapStr.length() > MAX_PREVIEW + 5 )
       {
         mapStr = tr( "%1…" ).arg( mapStr.left( MAX_PREVIEW ) );
         break;
       }
     }
     mapStr += QStringLiteral( " }" );
-    return tr( "<i>&lt;map: %1&gt;</i>" ).arg( mapStr );
+    return tr( "<i>&lt;%1&gt;</i>" ).arg( mapStr );
   }
   else if ( value.type() == QVariant::List || value.type() == QVariant::StringList )
   {
@@ -941,7 +941,7 @@ QString QgsExpression::formatPreviewString( const QVariant &value )
       }
     }
     listStr += QStringLiteral( " ]" );
-    return tr( "<i>&lt;array: %1&gt;</i>" ).arg( listStr );
+    return tr( "<i>&lt;%1&gt;</i>" ).arg( listStr );
   }
   else
   {