Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2697 from SebDieBln/FixVectorJoinDialog
Fix vector join dialog
  • Loading branch information
3nids committed Jan 19, 2016
2 parents 81448f8 + 01603d7 commit 2bacece
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/app/qgsjoindialog.cpp
Expand Up @@ -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* ) ) );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsmaplayerproxymodel.cpp
Expand Up @@ -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 );
Expand Down

0 comments on commit 2bacece

Please sign in to comment.