Address bugs with new featurres and validation

qgis · Dec 6, 2019 · e379b03 · e379b03
1 parent 80b2882
commit e379b03
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/gui/editorwidgets/qgstexteditwrapper.cpp b/src/gui/editorwidgets/qgstexteditwrapper.cpp
@@ -90,7 +90,12 @@ QVariant QgsTextEditWrapper::value() const
     else
       // return null value if json is invalid
     {
-      mInvalidJSON = true;
+      if ( field().length() > 0 )
+      {
+        mInvalidJSON = true;
+      } else {
+        mInvalidJSON = false;
+      }
       return QVariant();
     }
   }
@@ -203,7 +208,7 @@ void QgsTextEditWrapper::setFeature( const QgsFeature &feature )
 {
   // Do nothing if the value has not changed
   if ( mInvalidJSON )
-    mForm->displayWarning( tr( "Your JSON is invalid and will be reverted back to the last valid edit or the original data" ) );
+    mForm->displayWarning( tr( "Your JSON was invalid and has been reverted back to the last valid edit or the original data" ) );
   {
     mInvalidJSON = false;
   }

diff --git a/src/gui/qgsfieldvalidator.cpp b/src/gui/qgsfieldvalidator.cpp
@@ -154,6 +154,9 @@ QValidator::State QgsFieldValidator::validate( QString &s, int &i ) const
   {
     return QDate::fromString( s, mDateFormat ).isValid() ? Acceptable : Intermediate;
   }
+  else if ( mField.type() == QVariant::Map) {
+    return Acceptable;
+  }
   else
   {
     QgsDebugMsg( QStringLiteral( "unsupported type %1 for validation" ).arg( mField.type() ) );