Merge pull request #34514 from elpaso/bugfix-gh34404-crash-on-apply-d…

…efault-value-3_10 [backport] Fix crash when switching "apply default value on update"
qgis · Feb 21, 2020 · 0d82078 · 0d82078
2 parents 282bc33 + 2e939e0
commit 0d82078
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 26 deletions.
diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp
@@ -446,6 +446,10 @@ bool QgsAttributeForm::saveEdits()
 
 bool QgsAttributeForm::updateDefaultValues( const int originIdx )
 {
+
+  // Synchronize
+  updateDefaultValueDependencies();
+
   if ( !mDefaultValueDependencies.contains( originIdx ) )
     return false;
 
@@ -1544,32 +1548,7 @@ void QgsAttributeForm::init()
     }
   }
 
-  //create defaultValueDependencies
-  for ( QgsWidgetWrapper *ww : qgis::as_const( mWidgets ) )
-  {
-    QgsEditorWidgetWrapper *eww = qobject_cast<QgsEditorWidgetWrapper *>( ww );
-    if ( eww )
-    {
-      QgsExpression exp( eww->field().defaultValueDefinition().expression() );
-      const QSet<QString> referencedColumns = exp.referencedColumns();
-      for ( const QString &referencedColumn : referencedColumns )
-      {
-        if ( referencedColumn == QgsFeatureRequest::ALL_ATTRIBUTES )
-        {
-          const QList<int> allAttributeIds( mLayer->fields().allAttributesList() );
-
-          for ( const int id : allAttributeIds )
-          {
-            mDefaultValueDependencies.insertMulti( id, eww );
-          }
-        }
-        else
-        {
-          mDefaultValueDependencies.insertMulti( mLayer->fields().lookupField( referencedColumn ), eww );
-        }
-      }
-    }
-  }
+  updateDefaultValueDependencies();
 
   if ( !mButtonBox )
   {
@@ -2401,6 +2380,37 @@ bool QgsAttributeForm::fieldIsEditable( int fieldIndex ) const
   return QgsVectorLayerUtils::fieldIsEditable( mLayer, fieldIndex, mFeature );
 }
 
+void QgsAttributeForm::updateDefaultValueDependencies()
+{
+  mDefaultValueDependencies.clear();
+  //create defaultValueDependencies
+  for ( QgsWidgetWrapper *ww : qgis::as_const( mWidgets ) )
+  {
+    QgsEditorWidgetWrapper *eww = qobject_cast<QgsEditorWidgetWrapper *>( ww );
+    if ( eww )
+    {
+      QgsExpression exp( eww->field().defaultValueDefinition().expression() );
+      const QSet<QString> referencedColumns = exp.referencedColumns();
+      for ( const QString &referencedColumn : referencedColumns )
+      {
+        if ( referencedColumn == QgsFeatureRequest::ALL_ATTRIBUTES )
+        {
+          const QList<int> allAttributeIds( mLayer->fields().allAttributesList() );
+
+          for ( const int id : allAttributeIds )
+          {
+            mDefaultValueDependencies.insertMulti( id, eww );
+          }
+        }
+        else
+        {
+          mDefaultValueDependencies.insertMulti( mLayer->fields().lookupField( referencedColumn ), eww );
+        }
+      }
+    }
+  }
+}
+
 void QgsAttributeForm::updateIcon( QgsEditorWidgetWrapper *eww )
 {
   if ( !eww->widget() || !mIconMap[eww->widget()] )

diff --git a/src/gui/qgsattributeform.h b/src/gui/qgsattributeform.h
@@ -325,6 +325,8 @@ class GUI_EXPORT QgsAttributeForm : public QWidget
 
     bool fieldIsEditable( const QgsVectorLayer &layer, int fieldIndex, QgsFeatureId fid ) const;
 
+    void updateDefaultValueDependencies();
+
     struct WidgetInfo
     {
       QWidget *widget = nullptr;