emit currentIndexChanged onDataChanged

signedav · signedav · commit fabce526b7a0 · 2018-07-19T09:26:17.000+02:00
Because this effects that the data related to the combobox (emedded forms) got updated. they update because of an index change, but needed to be updated even when the index does not change (but the data). This goes over the same canal here. (cherry-picked from 56fe370)
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -556,8 +556,6 @@ 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 );
 
-    mReferencedLayer->getFeatures( mComboBox->currentFeatureRequest() ).nextFeature( mFeature );
-    highlightFeature( mFeature );
     updateAttributeEditorFrame( mFeature );
     QApplication::restoreOverrideCursor();
   }
diff --git a/src/gui/qgsfeaturelistcombobox.cpp b/src/gui/qgsfeaturelistcombobox.cpp
@@ -160,6 +160,7 @@ 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,8 +556,6 @@ 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`		`- mReferencedLayer->getFeatures( mComboBox->currentFeatureRequest() ).nextFeature( mFeature );`
`560`		`- highlightFeature( mFeature );`
`561`	`559`	`updateAttributeEditorFrame( mFeature );`
`562`	`560`	`QApplication::restoreOverrideCursor();`
`563`	`561`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ 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 );`
`163`	`164`	`}`
`164`	`165`	`}`
`165`	`166`