Merge pull request #8721 from signedav/json-for-valuerelations

Storing Value Releation multi-selection as JSON
qgis · Jan 8, 2019 · 15ddb27 · 15ddb27
2 parents 3732cb7 + 6e91349
commit 15ddb27
Show file tree

Hide file tree

Showing 4 changed files with 286 additions and 6 deletions.
diff --git a/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp b/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp
@@ -39,9 +39,6 @@ QString QgsValueRelationFieldFormatter::id() const
 
 QString QgsValueRelationFieldFormatter::representValue( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const
 {
-  Q_UNUSED( layer )
-  Q_UNUSED( fieldIndex )
-
   ValueRelationCache vrCache;
 
   if ( cache.isValid() )
@@ -55,7 +52,18 @@ QString QgsValueRelationFieldFormatter::representValue( QgsVectorLayer *layer, i
 
   if ( config.value( QStringLiteral( "AllowMulti" ) ).toBool() )
   {
-    QStringList keyList = valueToStringList( value );
+    QStringList keyList;
+
+    if ( layer->fields().at( fieldIndex ).type() == QVariant::Map )
+    {
+      //because of json it's stored as QVariantList
+      keyList = value.toStringList();
+    }
+    else
+    {
+      keyList = valueToStringList( value );
+    }
+
     QStringList valueList;
 
     for ( const QgsValueRelationFieldFormatter::ValueRelationItem &item : qgis::as_const( vrCache ) )

diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp
@@ -69,7 +69,22 @@ QVariant QgsValueRelationWidgetWrapper::value() const
         }
       }
     }
-    v = selection.join( QStringLiteral( "," ) ).prepend( '{' ).append( '}' );
+
+    if ( layer()->fields().at( fieldIdx() ).type() == QVariant::Map )
+    {
+      QVariantList vl;
+      //store as QVariantList because it's json
+      for ( const QString &s : qgis::as_const( selection ) )
+      {
+        vl << s;
+      }
+      v = vl;
+    }
+    else
+    {
+      //store as hstore string
+      v = selection.join( ',' ).prepend( '{' ).append( '}' );
+    }
   }
 
   if ( mLineEdit )
@@ -149,7 +164,17 @@ void QgsValueRelationWidgetWrapper::setValue( const QVariant &value )
 {
   if ( mTableWidget )
   {
-    QStringList checkList( QgsValueRelationFieldFormatter::valueToStringList( value ) );
+    QStringList checkList;
+
+    if ( layer()->fields().at( fieldIdx() ).type() == QVariant::Map )
+    {
+      //because of json it's stored as QVariantList
+      checkList = value.toStringList();
+    }
+    else
+    {
+      checkList = QgsValueRelationFieldFormatter::valueToStringList( value );
+    }
 
     QTableWidgetItem *lastChangedItem = nullptr;