sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38968 from 3nids/rel-ref-fix-ps

Browse Source 
fix edge case where fkey is 0 in relation reference widget
This commit is contained in:
Nyall Dawson 2020-09-25 09:16:31 +10:00 committed by GitHub
commit c7633874aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/qgsfeaturefiltermodel.cpp
View File

@ -151,6 +151,6 @@ void QgsFeatureFilterModel::setExtraIdentifierValues( const QVariantList &extraI
void QgsFeatureFilterModel::setExtraIdentifierValueToNull()
{
setExtraIdentifierValue( QVariantList() );
setExtraIdentifierValue( nullIdentifier() );
}

2
src/core/qgsfeaturepickermodelbase.cpp
View File

@ -612,7 +612,7 @@ void QgsFeaturePickerModelBase::reload()
void QgsFeaturePickerModelBase::setExtraIdentifierValue( const QVariant &extraIdentifierValue )
{
if ( extraIdentifierValue == mExtraIdentifierValue && !identifierIsNull( extraIdentifierValue ) )
if ( extraIdentifierValue == mExtraIdentifierValue && !identifierIsNull( extraIdentifierValue ) && !identifierIsNull( mExtraIdentifierValue ) )
return;
if ( mIsSettingExtraIdentifierValue )

4
src/gui/editorwidgets/qgsrelationreferencewidget.cpp
View File

@ -599,7 +599,7 @@ 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 );
connect( mComboBox, qgis::overload<int>::of( &QComboBox::currentIndexChanged ), this, &QgsRelationReferenceWidget::comboReferenceChanged );
QApplication::restoreOverrideCursor();
@ -1074,7 +1074,7 @@ void QgsRelationReferenceWidget::disableChainedComboBoxes( const QComboBox *scb
void QgsRelationReferenceWidget::emitForeignKeysChanged( const QVariantList &foreignKeys, bool force )
{
if ( foreignKeys == mForeignKeys && force == false )
if ( foreignKeys == mForeignKeys && force == false && qVariantListIsNull( foreignKeys ) == qVariantListIsNull( mForeignKeys ) )
return;
mForeignKeys = foreignKeys;

13
tests/src/gui/testqgsrelationreferencewidget.cpp
View File

@ -518,22 +518,27 @@ void TestQgsRelationReferenceWidget::testSetGetForeignKey()
w.setRelation( *mRelation, true );
w.init();
QSignalSpy spy( &w, SIGNAL( foreignKeyChanged( QVariant ) ) );
QSignalSpy spy( &w, &QgsRelationReferenceWidget::foreignKeysChanged );
w.setForeignKeys( QVariantList() << 0 );
QCOMPARE( w.foreignKeys().at( 0 ), QVariant( 0 ) );
QCOMPARE( w.mComboBox->currentText(), QStringLiteral( "(0)" ) );
QCOMPARE( spy.count(), 1 );
w.setForeignKeys( QVariantList() << 11 );
QCOMPARE( w.foreignKeys().at( 0 ), QVariant( 11 ) );
QCOMPARE( w.mComboBox->currentText(), QStringLiteral( "(11)" ) );
QCOMPARE( spy.count(), 1 );
QCOMPARE( spy.count(), 2 );
w.setForeignKeys( QVariantList() << 12 );
QCOMPARE( w.foreignKeys().at( 0 ), QVariant( 12 ) );
QCOMPARE( w.mComboBox->currentText(), QStringLiteral( "(12)" ) );
QCOMPARE( spy.count(), 2 );
QCOMPARE( spy.count(), 3 );
w.setForeignKeys( QVariantList() << QVariant() );
QVERIFY( w.foreignKeys().at( 0 ).isNull() );
QVERIFY( w.foreignKeys().at( 0 ).isValid() );
QCOMPARE( spy.count(), 3 );
QCOMPARE( spy.count(), 4 );
}
// Test issue https://github.com/qgis/QGIS/issues/29884