Suppress attribute form popup if layer has no fields

nyalldawson · nyalldawson · commit ee68332ed76a · 2015-02-25T21:56:43.000+11:00
Prevents empty form popup for layers with no fields (eg memory layers). If desired, this behaviour can be overriden by the layer's feature form suppress option, eg if form has python logic which makes it useful even with no fields. (fix #10775)
diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -163,8 +163,10 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, boo
     mFeature.setAttribute( idx, v );
   }
 
-  // show the dialog to enter attribute values
-  bool isDisabledAttributeValuesDlg = settings.value( "/qgis/digitizing/disable_enter_attribute_values_dialog", false ).toBool();
+  //show the dialog to enter attribute values
+  //only show if enabled in settings and layer has fields
+  bool isDisabledAttributeValuesDlg = ( fields.count() == 0 ) || settings.value( "/qgis/digitizing/disable_enter_attribute_values_dialog", false ).toBool();
+
   // override application-wide setting with any layer setting
   switch ( mLayer->featureFormSuppress() )
   {

Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,10 @@ bool QgsFeatureAction::addFeature( const QgsAttributeMap& defaultAttributes, boo`
`163`	`163`	`mFeature.setAttribute( idx, v );`
`164`	`164`	`}`
`165`	`165`
`166`		`- // show the dialog to enter attribute values`
`167`		`- bool isDisabledAttributeValuesDlg = settings.value( "/qgis/digitizing/disable_enter_attribute_values_dialog", false ).toBool();`
	`166`	`+ //show the dialog to enter attribute values`
	`167`	`+ //only show if enabled in settings and layer has fields`
	`168`	`+ bool isDisabledAttributeValuesDlg = ( fields.count() == 0 ) \|\| settings.value( "/qgis/digitizing/disable_enter_attribute_values_dialog", false ).toBool();`
	`169`	`+`
`168`	`170`	`// override application-wide setting with any layer setting`
`169`	`171`	`switch ( mLayer->featureFormSuppress() )`
`170`	`172`	`{`