Show literal defaults in add feature form

qgis · Nov 7, 2016 · 94413c3 · 94413c3
1 parent b0bd61f
commit 94413c3
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -176,7 +176,17 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, boo
     }
     else
     {
-      v = provider->defaultValueClause( idx );
+      QVariant defaultLiteral = mLayer->dataProvider()->defaultValue( idx );
+      if ( defaultLiteral.isValid() )
+      {
+        v = defaultLiteral;
+      }
+      else
+      {
+        QString defaultClause = provider->defaultValueClause( idx );
+        if ( !defaultClause.isEmpty() )
+          v = defaultClause;
+      }
     }
 
     mFeature->setAttribute( idx, v );