Skip to content
Permalink
Browse files

Merge pull request #2827 from SebDieBln/AllowNullInRelationRef

[Bugfix] offer NULL value in relation reference widget if allowed (fixes #14162)
  • Loading branch information
m-kuhn committed Mar 8, 2016
2 parents c6ebb8c + cc19a57 commit e08130d716a34e13cba4518e4cc9ac56d82a93da
@@ -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 )
@@ -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 ) ) );

0 comments on commit e08130d

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