From 7527651bfa86a226352fc3c4b35e49750902162f Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias.kuhn@gmx.ch>
Date: Fri, 17 Apr 2015 12:43:58 +0200
Subject: [PATCH] Fix RelationReference widget

previously it would not return any value when the content changed since 868eeb2
---
 .../qgsrelationreferencewidget.cpp            | 26 ++++++++++---------
 .../qgsrelationreferencewidget.h              |  1 -
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
index 5512d75496f..8460b367505 100644
--- a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
+++ b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp
@@ -364,7 +364,7 @@ QVariant QgsRelationReferenceWidget::foreignKey()
     }
     else
     {
-      return mFidFkMap.value( varFid.value<QgsFeatureId>() );
+      return mFeature.attribute( mFkeyFieldIdx );
     }
   }
 }
@@ -510,8 +510,12 @@ void QgsRelationReferenceWidget::init()
     mFeatureListModel->setInjectNull( mAllowNull );
     if ( mOrderByValue )
     {
-      int sortIdx = mReferencedLayer->fieldNameIndex( QgsExpression( mReferencedLayer->displayExpression() ).referencedColumns().first() );
-      mFilterModel->sort( sortIdx );
+      const QStringList referencedColumns = QgsExpression( mReferencedLayer->displayExpression() ).referencedColumns();
+      if ( referencedColumns.size() > 0 )
+      {
+        int sortIdx = mReferencedLayer->fieldNameIndex( referencedColumns.first() );
+        mFilterModel->sort( sortIdx );
+      }
     }
 
     mComboBox->setModel( mFeatureListModel );
@@ -531,7 +535,7 @@ void QgsRelationReferenceWidget::init()
     mComboBox->setCurrentIndex( mComboBox->findData( mFeature.id(), QgsAttributeTableModel::FeatureIdRole ) );
 
     // Only connect after iterating, to have only one iterator on the referenced table at once
-    connect( mComboBox, SIGNAL( activated( int ) ), this, SLOT( comboReferenceChanged( int ) ) );
+    connect( mComboBox, SIGNAL( currentIndexChanged(int) ), this, SLOT( comboReferenceChanged( int ) ) );
     QApplication::restoreOverrideCursor();
   }
 }
@@ -671,12 +675,11 @@ void QgsRelationReferenceWidget::mapIdentification()
 
 void QgsRelationReferenceWidget::comboReferenceChanged( int index )
 {
-  QgsFeatureId fid = mComboBox->itemData( index ).value<QgsFeatureId>();
-  QgsFeature feat;
-  mReferencedLayer->getFeatures( QgsFeatureRequest().setFilterFid( fid ) ).nextFeature( feat );
-  highlightFeature( feat );
-  updateAttributeEditorFrame( feat );
-  emit foreignKeyChanged( mFidFkMap.value( fid ) );
+  QgsFeatureId fid = mComboBox->itemData( index, QgsAttributeTableModel::FeatureIdRole ).value<QgsFeatureId>();
+  mReferencedLayer->getFeatures( QgsFeatureRequest().setFilterFid( fid ) ).nextFeature( mFeature );
+  highlightFeature( mFeature );
+  updateAttributeEditorFrame( mFeature );
+  emit foreignKeyChanged( mFeature.attribute( mFkeyFieldIdx ) );
 }
 
 void QgsRelationReferenceWidget::updateAttributeEditorFrame( const QgsFeature feature )
@@ -708,6 +711,7 @@ void QgsRelationReferenceWidget::featureIdentified( const QgsFeature& feature )
   else
   {
     mComboBox->setCurrentIndex( mComboBox->findData( feature.attribute( mFkeyFieldIdx ), QgsAttributeTableModel::FeatureIdRole ) );
+    mFeature = feature;
   }
 
   mRemoveFKButton->setEnabled( mIsEditable );
@@ -802,8 +806,6 @@ void QgsRelationReferenceWidget::filterChanged()
     {
       const QString fieldName = cb->property( "Field" ).toString();
 
-      cb->itemData( cb->currentIndex() );
-
       if ( cb->currentText() == nullValue.toString() )
       {
         filters << QString( "\"%1\" IS NULL" ).arg( fieldName );
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.h b/src/gui/editorwidgets/qgsrelationreferencewidget.h
index f3f6ef03864..2b78ae5b55e 100644
--- a/src/gui/editorwidgets/qgsrelationreferencewidget.h
+++ b/src/gui/editorwidgets/qgsrelationreferencewidget.h
@@ -176,7 +176,6 @@ class GUI_EXPORT QgsRelationReferenceWidget : public QWidget
 
     // UI
     QVBoxLayout* mTopLayout;
-    QHash<QgsFeatureId, QVariant> mFidFkMap; // Mapping from feature id => foreign key
     QToolButton* mMapIdentificationButton;
     QToolButton* mRemoveFKButton;
     QToolButton* mOpenFormButton;