Show only provider fields as join target candidates (ticket #4136)

qgis · Aug 12, 2011 · 494c65b · 494c65b
1 parent 7d73cd8
commit 494c65b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/app/qgsaddjoindialog.cpp b/src/app/qgsaddjoindialog.cpp
@@ -52,11 +52,15 @@ QgsAddJoinDialog::QgsAddJoinDialog( QgsVectorLayer* layer, QWidget * parent, Qt:
   on_mJoinLayerComboBox_currentIndexChanged( mJoinLayerComboBox->currentIndex() );
 
   //insert possible target fields
-  const QgsFieldMap& layerFieldMap = mLayer->pendingFields();
-  QgsFieldMap::const_iterator fieldIt = layerFieldMap.constBegin();
-  for ( ; fieldIt != layerFieldMap.constEnd(); ++fieldIt )
+  QgsVectorDataProvider* provider = mLayer->dataProvider();
+  if ( provider )
   {
-    mTargetFieldComboBox->addItem( fieldIt.value().name(), fieldIt.key() );
+    const QgsFieldMap& layerFieldMap = provider->fields();
+    QgsFieldMap::const_iterator fieldIt = layerFieldMap.constBegin();
+    for ( ; fieldIt != layerFieldMap.constEnd(); ++fieldIt )
+    {
+      mTargetFieldComboBox->addItem( fieldIt.value().name(), fieldIt.key() );
+    }
   }
 
   mCacheInMemoryCheckBox->setChecked( true );

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1068,7 +1068,7 @@ void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()
     info.memoryCache = d.cacheInMemory();
     if ( layer )
     {
-      //create attribute index if possible. Todo: ask user if this should be done (e.g. in QgsAddJoinDialog)
+      //create attribute index if possible
       if ( d.createAttributeIndex() )
       {
         QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );