Skip to content

Commit

Permalink
offer NULL value in relation reference widget if allowed (fixes #14162)
Browse files Browse the repository at this point in the history
  • Loading branch information
SebDieBln committed Feb 25, 2016
1 parent 17f20bb commit 5f157a9
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
15 changes: 13 additions & 2 deletions src/gui/attributetable/qgsfeaturelistmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,14 @@ QVariant QgsFeatureListModel::data( const QModelIndex &index, int role ) const
{
return QSettings().value( "qgis/nullValue", "NULL" ).toString();
}
else
else if ( role == QgsAttributeTableModel::FeatureIdRole )
{
return QVariant( QVariant::Int );
}
else
{
return QVariant( QVariant::Invalid );
}
}

if ( role == Qt::DisplayRole || role == Qt::EditRole )
Expand Down Expand Up @@ -122,7 +126,14 @@ QVariant QgsFeatureListModel::data( const QModelIndex &index, int role ) const

Qt::ItemFlags QgsFeatureListModel::flags( const QModelIndex &index ) const
{
return sourceModel()->flags( mapToSource( index ) ) & ~Qt::ItemIsEditable;
if ( mInjectNull && index.row() == 0 )
{
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
}
else
{
return sourceModel()->flags( mapToSource( index ) ) & ~Qt::ItemIsEditable;
}
}

void QgsFeatureListModel::setInjectNull( bool injectNull )
Expand Down
3 changes: 2 additions & 1 deletion src/gui/editorwidgets/qgsrelationreferencewidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,8 @@ void QgsRelationReferenceWidget::init()
}
}

mComboBox->setCurrentIndex( mComboBox->findData( mFeature.id(), QgsAttributeTableModel::FeatureIdRole ) );
QVariant featId = mFeature.isValid() ? mFeature.id() : QVariant( QVariant::Int );
mComboBox->setCurrentIndex( mComboBox->findData( featId, QgsAttributeTableModel::FeatureIdRole ) );

// Only connect after iterating, to have only one iterator on the referenced table at once
connect( mComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( comboReferenceChanged( int ) ) );
Expand Down

0 comments on commit 5f157a9

Please sign in to comment.