Field formatter: pass default value to the formatter

... even when it's equal to the default.
qgis · Jan 31, 2020 · 092894b · 092894b
1 parent 83e384a
commit 092894b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/core/qgsfieldformatter.cpp b/src/core/qgsfieldformatter.cpp
@@ -30,13 +30,13 @@ QString QgsFieldFormatter::representValue( QgsVectorLayer *layer, int fieldIndex
   if ( layer->fields().fieldOrigin( fieldIndex ) == QgsFields::OriginProvider && layer->dataProvider() )
     defVal = layer->dataProvider()->defaultValueClause( layer->fields().fieldOriginIndex( fieldIndex ) );
 
-  if ( layer->fields().exists( fieldIndex ) && ( defVal.isNull() || defVal != value ) )
+  if ( ! layer->fields().exists( fieldIndex ) )
   {
-    return layer->fields().at( fieldIndex ).displayString( value );
+    return defVal;
   }
   else
   {
-    return defVal;
+    return layer->fields().at( fieldIndex ).displayString( value.isNull() ? defVal : value );
   }
 }