Relation editor wdgs: fix ok/cancel button when embedded

Ok/Cancel button were shown even when embedded (followup #34827 ) Also add accessor for editorContext.
qgis · Mar 31, 2020 · 96bd689 · 96bd689
1 parent eb1ebcd
commit 96bd689
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/python/gui/auto_generated/qgsrelationeditorwidget.sip.in b/python/gui/auto_generated/qgsrelationeditorwidget.sip.in
@@ -81,6 +81,13 @@ Sets the editor ``context``
    the geometry of a referencing feature from this widget
 %End
 
+    QgsAttributeEditorContext editorContext( );
+%Docstring
+Returns the editor ``context``
+
+.. versionadded:: 3.14
+%End
+
     QgsIFeatureSelectionManager *featureSelectionManager();
 %Docstring
 The feature selection manager is responsible for the selected features

diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
@@ -90,7 +90,7 @@ void QgsRelationWidgetWrapper::widgetValueChanged( const QString &attribute, con
     if ( feature.attribute( attribute ) != newValue )
     {
       feature.setAttribute( attribute, newValue );
-      QgsAttributeEditorContext newContext { context() };
+      QgsAttributeEditorContext newContext { mWidget->editorContext() };
       newContext.setParentFormFeature( feature );
       mWidget->setEditorContext( newContext );
       mWidget->setFeature( feature, false );

diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
@@ -376,6 +376,11 @@ void QgsRelationEditorWidget::setEditorContext( const QgsAttributeEditorContext
   }
 }
 
+QgsAttributeEditorContext QgsRelationEditorWidget::editorContext()
+{
+  return mEditorContext;
+}
+
 QgsIFeatureSelectionManager *QgsRelationEditorWidget::featureSelectionManager()
 {
   return mFeatureSelectionMgr;

diff --git a/src/gui/qgsrelationeditorwidget.h b/src/gui/qgsrelationeditorwidget.h
@@ -139,6 +139,12 @@ class GUI_EXPORT QgsRelationEditorWidget : public QgsCollapsibleGroupBox
      */
     void setEditorContext( const QgsAttributeEditorContext &context );
 
+    /**
+     * Returns the editor \a context
+     * \since QGIS 3.14
+     */
+    QgsAttributeEditorContext editorContext( );
+
     /**
      * The feature selection manager is responsible for the selected features
      * which are currently being edited.