Merge pull request #5577 from m-kuhn/valuerelref

m-kuhn · web-flow · commit 9f65fcd0d929 · 2017-11-09T14:56:57.000+01:00
Fix value() method of relation reference widget
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -357,18 +357,7 @@ QVariant QgsRelationReferenceWidget::foreignKey() const
   }
   else
   {
-    if ( mReferencingFieldIdx < 0 || mReferencingFieldIdx >= mReferencingLayer->fields().count() )
-    {
-      return QVariant();
-    }
-    else if ( !mFeature.isValid() )
-    {
-      return QVariant( mReferencingLayer->fields().at( mReferencingFieldIdx ).type() );
-    }
-    else
-    {
-      return mFeature.attribute( mReferencedFieldIdx );
-    }
+    return mComboBox->identifierValue();
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -357,18 +357,7 @@ QVariant QgsRelationReferenceWidget::foreignKey() const`
`357`	`357`	`}`
`358`	`358`	`else`
`359`	`359`	`{`
`360`		`- if ( mReferencingFieldIdx < 0 \|\| mReferencingFieldIdx >= mReferencingLayer->fields().count() )`
`361`		`- {`
`362`		`- return QVariant();`
`363`		`- }`
`364`		`- else if ( !mFeature.isValid() )`
`365`		`- {`
`366`		`- return QVariant( mReferencingLayer->fields().at( mReferencingFieldIdx ).type() );`
`367`		`- }`
`368`		`- else`
`369`		`- {`
`370`		`- return mFeature.attribute( mReferencedFieldIdx );`
`371`		`- }`
	`360`	`+ return mComboBox->identifierValue();`
`372`	`361`	`}`
`373`	`362`	`}`
`374`	`363`