sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2827 from SebDieBln/AllowNullInRelationRef

Browse Source 
[Bugfix] offer NULL value in relation reference widget if allowed (fixes #14162)
This commit is contained in:
Matthias Kuhn 2016-03-08 08:11:55 +01:00
commit e08130d716
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/attributetable/qgsfeaturelistmodel.cpp
View File

@ -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 )

10
src/gui/editorwidgets/qgsrelationreferencewidget.cpp
View File

@ -234,7 +234,11 @@ void QgsRelationReferenceWidget::setRelationEditable( bool editable )
void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )
{
if ( !value.isValid() || value.isNull() )
if ( !value.isValid() )
{
return;
}
if ( value.isNull() )
{
deleteForeignKey();
return;
@ -254,7 +258,6 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )
if ( !mFeature.isValid() )
{
deleteForeignKey();
return;
}
@ -535,7 +538,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 ) ) );