Fix relation reference widget accidentally sets FK to NULL

m-kuhn · m-kuhn · commit 4eaf8de75f59 · 2015-07-24T18:57:24.000+02:00
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -245,24 +245,12 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )
   if ( !mReferencedLayer )
     return;
 
-  QgsFeatureIterator fit;
+  QgsAttributes attrs = QgsAttributes( mReferencingLayer->pendingFields().count() );
+  attrs[mFkeyFieldIdx] = value;
 
-  // TODO: Rewrite using expression
-  if ( mMasterModel )
-  {
-    fit = mMasterModel->layerCache()->getFeatures( QgsFeatureRequest() );
-  }
-  else
-  {
-    fit = mReferencedLayer->getFeatures( QgsFeatureRequest() );
-  }
-  while ( fit.nextFeature( mFeature ) )
-  {
-    if ( mFeature.attribute( mFkeyFieldIdx ) == value )
-    {
-      break;
-    }
-  }
+  QgsFeatureRequest request = mRelation.getReferencedFeatureRequest( attrs );
+
+  mReferencedLayer->getFeatures( request ).nextFeature( mFeature );
 
   if ( !mFeature.isValid() )
   {
@@ -284,7 +272,7 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )
   }
   else
   {
-    int i = mComboBox->findData( value, QgsAttributeTableModel::FeatureIdRole );
+    int i = mComboBox->findData( mFeature.id(), QgsAttributeTableModel::FeatureIdRole );
     if ( i == -1 && mAllowNull )
     {
       mComboBox->setCurrentIndex( 0 );
@@ -358,10 +346,9 @@ QVariant QgsRelationReferenceWidget::foreignKey()
   }
   else
   {
-    QVariant varFid = mComboBox->itemData( mComboBox->currentIndex(), QgsAttributeTableModel::FeatureIdRole );
-    if ( varFid.isNull() )
+    if ( !mFeature.isValid() )
     {
-      return QVariant();
+      return QVariant( mReferencingLayer->pendingFields().at( mFkeyFieldIdx ).type() );
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -245,24 +245,12 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )`
`245`	`245`	`if ( !mReferencedLayer )`
`246`	`246`	`return;`
`247`	`247`
`248`		`- QgsFeatureIterator fit;`
	`248`	`+ QgsAttributes attrs = QgsAttributes( mReferencingLayer->pendingFields().count() );`
	`249`	`+ attrs[mFkeyFieldIdx] = value;`
`249`	`250`
`250`		`- // TODO: Rewrite using expression`
`251`		`- if ( mMasterModel )`
`252`		`- {`
`253`		`- fit = mMasterModel->layerCache()->getFeatures( QgsFeatureRequest() );`
`254`		`- }`
`255`		`- else`
`256`		`- {`
`257`		`- fit = mReferencedLayer->getFeatures( QgsFeatureRequest() );`
`258`		`- }`
`259`		`- while ( fit.nextFeature( mFeature ) )`
`260`		`- {`
`261`		`- if ( mFeature.attribute( mFkeyFieldIdx ) == value )`
`262`		`- {`
`263`		`- break;`
`264`		`- }`
`265`		`- }`
	`251`	`+ QgsFeatureRequest request = mRelation.getReferencedFeatureRequest( attrs );`
	`252`	`+`
	`253`	`+ mReferencedLayer->getFeatures( request ).nextFeature( mFeature );`
`266`	`254`
`267`	`255`	`if ( !mFeature.isValid() )`
`268`	`256`	`{`
`@@ -284,7 +272,7 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )`
`284`	`272`	`}`
`285`	`273`	`else`
`286`	`274`	`{`
`287`		`- int i = mComboBox->findData( value, QgsAttributeTableModel::FeatureIdRole );`
	`275`	`+ int i = mComboBox->findData( mFeature.id(), QgsAttributeTableModel::FeatureIdRole );`
`288`	`276`	`if ( i == -1 && mAllowNull )`
`289`	`277`	`{`
`290`	`278`	`mComboBox->setCurrentIndex( 0 );`
`@@ -358,10 +346,9 @@ QVariant QgsRelationReferenceWidget::foreignKey()`
`358`	`346`	`}`
`359`	`347`	`else`
`360`	`348`	`{`
`361`		`- QVariant varFid = mComboBox->itemData( mComboBox->currentIndex(), QgsAttributeTableModel::FeatureIdRole );`
`362`		`- if ( varFid.isNull() )`
	`349`	`+ if ( !mFeature.isValid() )`
`363`	`350`	`{`
`364`		`- return QVariant();`
	`351`	`+ return QVariant( mReferencingLayer->pendingFields().at( mFkeyFieldIdx ).type() );`
`365`	`352`	`}`
`366`	`353`	`else`
`367`	`354`	`{`