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

mhugent · marco · commit 39749d06014c · 2011-08-15T19:45:10.000+02:00
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
@@ -1291,7 +1291,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 ) );

Original file line number	Diff line number	Diff line change
`@@ -1291,7 +1291,7 @@ void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()`
`1291`	`1291`	`info.memoryCache = d.cacheInMemory();`
`1292`	`1292`	`if ( layer )`
`1293`	`1293`	`{`
`1294`		`- //create attribute index if possible. Todo: ask user if this should be done (e.g. in QgsAddJoinDialog)`
	`1294`	`+ //create attribute index if possible`
`1295`	`1295`	`if ( d.createAttributeIndex() )`
`1296`	`1296`	`{`
`1297`	`1297`	`QgsVectorLayer* joinLayer = qobject_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( info.joinLayerId ) );`