Fix stacktrace issue when switching parent feature and child attribut…

…e form is reset (#6)
opengisch · Nov 23, 2021 · 5780e67 · 5780e67
1 parent 1eb6c9f
commit 5780e67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ordered_relation_editor/core/ordered_relation_model.py b/ordered_relation_editor/core/ordered_relation_model.py
@@ -172,6 +172,8 @@ def reloadData(self):
             self._related_features = sorted(self._related_features, key=lambda _f: _f[self._ordering_field])
 
         self.endResetModel()
+        # emit a currentFeatureChanged signal with an invalid feature to reset the widget
+        self.currentFeatureChanged.emit(QgsFeature())
 
 
 

diff --git a/ordered_relation_editor/gui/ordered_relation_editor_widget.py b/ordered_relation_editor/gui/ordered_relation_editor_widget.py
@@ -105,7 +105,7 @@ def parentFormValueChanged(self, attribute, newValue):
         if self.attribute_form:
             self.attribute_form.parentFormValueChanged(attribute, newValue)
 
-    def onCurrentFeatureChanged(self, feature):
+    def onCurrentFeatureChanged(self, feature = QgsFeature()):
         if not self.attribute_form and feature.isValid():
             self.attribute_form = QgsAttributeForm(self.relation().referencingLayer(), feature, self.editorContext())
             if not self.editorContext().parentContext():
@@ -115,7 +115,7 @@ def onCurrentFeatureChanged(self, feature):
                 attribute_editor_scroll_area.setWidget(self.attribute_form)
             else:
                 self.mAttributeFormView.layout().addWidget(self.attribute_form)
-        else:
+        elif self.attribute_form:
             if self.relation().referencingLayer().isEditable():
                 if self.attribute_form.save():
                     self.model.reloadData()
@@ -124,6 +124,7 @@ def onCurrentFeatureChanged(self, feature):
                 self.attribute_form.setFeature(feature)
             else:
                 self.attribute_form.deleteLater()
+                self.attribute_form = None
 
         self.update_buttons()