Valu relation widget: fix allowMulti + not null

Fix #46366 by changing the returned value from the widget when allowMulti is ON and allowNull is OFF, in this case when the user makes no selection an invalid QVariant is returned instead of a (valid) empty list of QVariant(s).
qgis · Dec 11, 2021 · a133362 · a133362
1 parent 9739960
commit a133362
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp
@@ -77,6 +77,12 @@ QVariant QgsValueRelationWidgetWrapper::value() const
       }
     }
 
+    // If there is no selection and allow NULL is not checked return invalid.
+    if ( selection.isEmpty() && ! config( QStringLiteral( "AllowNull" ) ).toBool( ) )
+    {
+      return QVariant();
+    }
+
     QVariantList vl;
     //store as QVariantList because the field type supports data structure
     for ( const QString &s : std::as_const( selection ) )

diff --git a/tests/src/gui/testqgsvaluerelationwidgetwrapper.cpp b/tests/src/gui/testqgsvaluerelationwidgetwrapper.cpp
@@ -1337,6 +1337,10 @@ void TestQgsValueRelationWidgetWrapper::testWithJsonInSpatialite()
 
   // FEATURE 4
   w_favoriteauthors.setFeature( vl_json->getFeature( 4 ) );
+  // Because allowNull is false we have an invalid variant here
+  QCOMPARE( w_favoriteauthors.value(), QVariant( ) );
+  cfg_favoriteauthors[ QStringLiteral( "AllowNull" ) ] = true;
+  w_favoriteauthors.setConfig( cfg_favoriteauthors );
   //check if first feature checked correctly (NULL)
   QCOMPARE( w_favoriteauthors.value(), QVariant( QVariantList() ) );
   QCOMPARE( w_favoriteauthors.mTableWidget->item( 0, 0 )->checkState(), Qt::Unchecked );
@@ -1346,9 +1350,16 @@ void TestQgsValueRelationWidgetWrapper::testWithJsonInSpatialite()
   QCOMPARE( w_favoriteauthors.mTableWidget->item( 4, 0 )->checkState(), Qt::Unchecked );
   QCOMPARE( w_favoriteauthors.mTableWidget->item( 5, 0 )->checkState(), Qt::Unchecked );
   QCOMPARE( w_favoriteauthors.mTableWidget->item( 6, 0 )->checkState(), Qt::Unchecked );
+  cfg_favoriteauthors[ QStringLiteral( "AllowNull" ) ] = false;
+  w_favoriteauthors.setConfig( cfg_favoriteauthors );
 
   // FEATURE 5
   w_favoriteauthors.setFeature( vl_json->getFeature( 5 ) );
+  // Because allowNull is false we have an invalid variant here
+  QCOMPARE( w_favoriteauthors.value(), QVariant( ) );
+
+  cfg_favoriteauthors[ QStringLiteral( "AllowNull" ) ] = true;
+  w_favoriteauthors.setConfig( cfg_favoriteauthors );
   //check if first feature checked correctly (blank)
   QCOMPARE( w_favoriteauthors.value(), QVariant( QVariantList( ) ) );
   QCOMPARE( w_favoriteauthors.mTableWidget->item( 0, 0 )->checkState(), Qt::Unchecked );
@@ -1495,6 +1506,11 @@ void TestQgsValueRelationWidgetWrapper::testWithJsonInSpatialiteTextFk()
   // FEATURE 4
   w_favoriteauthors.setFeature( vl_json->getFeature( 4 ) );
 
+  // Because allowNull is false we have an invalid variant here
+  QCOMPARE( w_favoriteauthors.value(), QVariant( ) );
+  cfg_favoriteauthors[ QStringLiteral( "AllowNull" ) ] = true;
+  w_favoriteauthors.setConfig( cfg_favoriteauthors );
+
   //check if first feature checked correctly (NULL)
   QCOMPARE( w_favoriteauthors.value(), QVariant( QVariantList( ) ) );
 
@@ -1505,10 +1521,17 @@ void TestQgsValueRelationWidgetWrapper::testWithJsonInSpatialiteTextFk()
   QCOMPARE( w_favoriteauthors.mTableWidget->item( 4, 0 )->checkState(), Qt::Unchecked );
   QCOMPARE( w_favoriteauthors.mTableWidget->item( 5, 0 )->checkState(), Qt::Unchecked );
   QCOMPARE( w_favoriteauthors.mTableWidget->item( 6, 0 )->checkState(), Qt::Unchecked );
+  cfg_favoriteauthors[ QStringLiteral( "AllowNull" ) ] = false;
+  w_favoriteauthors.setConfig( cfg_favoriteauthors );
 
   // FEATURE 5
   w_favoriteauthors.setFeature( vl_json->getFeature( 5 ) );
 
+  // Because allowNull is false we have an invalid variant here
+  QCOMPARE( w_favoriteauthors.value(), QVariant( ) );
+  cfg_favoriteauthors[ QStringLiteral( "AllowNull" ) ] = true;
+  w_favoriteauthors.setConfig( cfg_favoriteauthors );
+
   //check if first feature checked correctly (blank)
   QCOMPARE( w_favoriteauthors.value(), QVariant( QVariantList() ) );