From 5f157a903393ee4381f16b01733696f35ea6556e Mon Sep 17 00:00:00 2001 From: Sebastian Dietrich Date: Sun, 21 Feb 2016 18:18:47 +0100 Subject: [PATCH] offer NULL value in relation reference widget if allowed (fixes #14162) --- src/gui/attributetable/qgsfeaturelistmodel.cpp | 15 +++++++++++++-- .../editorwidgets/qgsrelationreferencewidget.cpp | 3 ++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/gui/attributetable/qgsfeaturelistmodel.cpp b/src/gui/attributetable/qgsfeaturelistmodel.cpp index 6a3d0dddda8..614c4653756 100644 --- a/src/gui/attributetable/qgsfeaturelistmodel.cpp +++ b/src/gui/attributetable/qgsfeaturelistmodel.cpp @@ -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 ) @@ -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 ) diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp index 0ee2346b515..43b9b945a02 100644 --- a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp +++ b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp @@ -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 ) ) );