Relation Reference Widget: Only enable form button when a feature is set

qgis · Jun 16, 2016 · 3ea35fc · 3ea35fc
1 parent 8868303
commit 3ea35fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -323,7 +323,7 @@ void QgsRelationReferenceWidget::deleteForeignKey()
   emit foreignKeyChanged( QVariant( QVariant::Int ) );
 }
 
-QgsFeature QgsRelationReferenceWidget::referencedFeature()
+QgsFeature QgsRelationReferenceWidget::referencedFeature() const
 {
   QgsFeature f;
   if ( mReferencedLayer )
@@ -356,7 +356,7 @@ void QgsRelationReferenceWidget::showIndeterminateState()
   updateAttributeEditorFrame( QgsFeature() );
 }
 
-QVariant QgsRelationReferenceWidget::foreignKey()
+QVariant QgsRelationReferenceWidget::foreignKey() const
 {
   if ( mReadOnlySelector )
   {
@@ -557,6 +557,7 @@ void QgsRelationReferenceWidget::init()
 
     // Only connect after iterating, to have only one iterator on the referenced table at once
     connect( mComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( comboReferenceChanged( int ) ) );
+    updateAttributeEditorFrame( mFeature );
     QApplication::restoreOverrideCursor();
   }
 }
@@ -706,13 +707,11 @@ void QgsRelationReferenceWidget::comboReferenceChanged( int index )
 
 void QgsRelationReferenceWidget::updateAttributeEditorFrame( const QgsFeature& feature )
 {
+  mOpenFormButton->setEnabled( feature.isValid() );
   // Check if we're running with an embedded frame we need to update
-  if ( mAttributeEditorFrame )
+  if ( mAttributeEditorFrame && mReferencedAttributeForm )
   {
-    if ( mReferencedAttributeForm )
-    {
-      mReferencedAttributeForm->setFeature( feature );
-    }
+    mReferencedAttributeForm->setFeature( feature );
   }
 }
 

diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.h b/src/gui/editorwidgets/qgsrelationreferencewidget.h
@@ -62,7 +62,7 @@ class GUI_EXPORT QgsRelationReferenceWidget : public QWidget
     void setForeignKey( const QVariant &value );
 
     //! returns the related feature foreign key
-    QVariant foreignKey();
+    QVariant foreignKey() const;
 
     void setEditorContext( const QgsAttributeEditorContext& context, QgsMapCanvas* canvas, QgsMessageBar* messageBar );
 
@@ -106,7 +106,7 @@ class GUI_EXPORT QgsRelationReferenceWidget : public QWidget
 
     //! return the related feature (from the referenced layer)
     //! if no feature is related, it returns an invalid feature
-    QgsFeature referencedFeature();
+    QgsFeature referencedFeature() const;
 
     /** Sets the widget to display in an indeterminate "mixed value" state.
      * @note added in QGIS 2.16