Skip to content
Permalink
Browse files

Merge pull request #2697 from SebDieBln/FixVectorJoinDialog

Fix vector join dialog
  • Loading branch information
3nids committed Jan 19, 2016
2 parents 81448f8 + 01603d7 commit 2bacecea0b0bf8c14cce079057837b2af73204b1
Showing with 2 additions and 1 deletion.
  1. +1 −0 src/app/qgsjoindialog.cpp
  2. +1 −1 src/gui/qgsmaplayerproxymodel.cpp
@@ -40,6 +40,7 @@ QgsJoinDialog::QgsJoinDialog( QgsVectorLayer* layer, QList<QgsMapLayer*> already

mTargetFieldComboBox->setLayer( mLayer );

mJoinLayerComboBox->setFilters( QgsMapLayerProxyModel::VectorLayer );
mJoinLayerComboBox->setExceptedLayerList( alreadyJoinedLayers );
connect( mJoinLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), mJoinFieldComboBox, SLOT( setLayer( QgsMapLayer* ) ) );
connect( mJoinLayerComboBox, SIGNAL( layerChanged( QgsMapLayer* ) ), this, SLOT( joinedLayerChanged( QgsMapLayer* ) ) );
@@ -46,7 +46,7 @@ void QgsMapLayerProxyModel::setExceptedLayerList( const QList<QgsMapLayer*>& exc

bool QgsMapLayerProxyModel::filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const
{
if ( mFilters.testFlag( All ) )
if ( mFilters.testFlag( All ) && mExceptList.isEmpty() )
return true;

QModelIndex index = sourceModel()->index( source_row, 0, source_parent );

0 comments on commit 2bacece

Please sign in to comment.
You can’t perform that action at this time.