initialization of embeddet form only once

signedav · signedav · commit e59ad8aabb47 · 2018-07-19T09:26:55.000+02:00
(cherry-picked from 56fe370)
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -556,7 +556,12 @@ void QgsRelationReferenceWidget::init()
     // Only connect after iterating, to have only one iterator on the referenced table at once
     connect( mComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsRelationReferenceWidget::comboReferenceChanged );
 
-    updateAttributeEditorFrame( mFeature );
+    if ( !mFeatureInitialized )
+    {
+      //call it for the first intialization
+      emit mComboBox->currentIndexChanged( mComboBox->currentIndex() );
+      mFeatureInitialized = true;
+    }
     QApplication::restoreOverrideCursor();
   }
 }
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.h b/src/gui/editorwidgets/qgsrelationreferencewidget.h
@@ -222,6 +222,7 @@ class GUI_EXPORT QgsRelationReferenceWidget : public QWidget
     bool mIsEditable = true;
     QStringList mFilterFields;
     QMap<QString, QMap<QString, QSet<QString> > > mFilterCache;
+    bool mFeatureInitialized = false;
 
     // Q_PROPERTY
     bool mEmbedForm = false;
diff --git a/src/gui/qgsfeaturelistcombobox.cpp b/src/gui/qgsfeaturelistcombobox.cpp
@@ -160,7 +160,6 @@ void QgsFeatureListComboBox::onDataChanged( const QModelIndex &topLeft, const QM
       QModelIndex modelIndex = mModel->index( currentIndex, 0, QModelIndex() );
       mLineEdit->setText( mModel->data( modelIndex, QgsFeatureFilterModel::ValueRole ).toString() );
     }
-    emit currentIndexChanged( currentIndex );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,12 @@ void QgsRelationReferenceWidget::init()`
`556`	`556`	`// Only connect after iterating, to have only one iterator on the referenced table at once`
`557`	`557`	`connect( mComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsRelationReferenceWidget::comboReferenceChanged );`
`558`	`558`
`559`		`- updateAttributeEditorFrame( mFeature );`
	`559`	`+ if ( !mFeatureInitialized )`
	`560`	`+ {`
	`561`	`+ //call it for the first intialization`
	`562`	`+ emit mComboBox->currentIndexChanged( mComboBox->currentIndex() );`
	`563`	`+ mFeatureInitialized = true;`
	`564`	`+ }`
`560`	`565`	`QApplication::restoreOverrideCursor();`
`561`	`566`	`}`
`562`	`567`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,6 @@ void QgsFeatureListComboBox::onDataChanged( const QModelIndex &topLeft, const QM`
`160`	`160`	`QModelIndex modelIndex = mModel->index( currentIndex, 0, QModelIndex() );`
`161`	`161`	`mLineEdit->setText( mModel->data( modelIndex, QgsFeatureFilterModel::ValueRole ).toString() );`
`162`	`162`	`}`
`163`		`- emit currentIndexChanged( currentIndex );`
`164`	`163`	`}`
`165`	`164`	`}`
`166`	`165`