Merge pull request #7354 from m-kuhn/rangewidget_nostep

Handle invalid step size
qgis · Jul 3, 2018 · 497637b8a58eb3e1e20a4e37333294eeb8db0fff · 497637b
2 parents 76f574a + 2469c9e
commit 497637b8a58eb3e1e20a4e37333294eeb8db0fff
Unified Split

Showing with 2 additions and 2 deletions.

+1 −1 src/gui/editorwidgets/qgsrangewidgetwrapper.cpp

+1 −1 tests/src/python/test_provider_postgres.py
diff --git a/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
@@ -138,7 +138,7 @@ void QgsRangeWidgetWrapper::initWidget( QWidget *editor )
     int minval = min.toInt();
     if ( allowNull )
     {
-      int stepval = step.toInt();
+      int stepval = step.isValid() ? step.toInt() : 1;
       minval -= stepval;
       mIntSpinBox->setValue( minval );
       mIntSpinBox->setSpecialValueText( QgsApplication::nullRepresentation() );

diff --git a/tests/src/python/test_provider_postgres.py b/tests/src/python/test_provider_postgres.py
@@ -479,7 +479,7 @@ def testTransactionConstrains(self):
 
         # check new values
         self.assertTrue(vl.getFeatures('id=1').nextFeature(f))
-        self.assertEqual(f.attributes(), [1, 1, NULL])
+        self.assertEqual(f.attributes(), [1, 1, 0])
 
     def testTransactionTuple(self):
         # create a vector layer based on postgres