Merge pull request #2827 from SebDieBln/AllowNullInRelationRef

m-kuhn · m-kuhn · commit e08130d716a3 · 2016-03-08T08:11:55.000+01:00
[Bugfix] offer NULL value in relation reference widget if allowed (fixes #14162)
diff --git 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
@@ -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 ) ) );

Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,14 @@ QVariant QgsFeatureListModel::data( const QModelIndex &index, int role ) const`
`61`	`61`	`{`
`62`	`62`	`return QSettings().value( "qgis/nullValue", "NULL" ).toString();`
`63`	`63`	`}`
`64`		`- else`
	`64`	`+ else if ( role == QgsAttributeTableModel::FeatureIdRole )`
`65`	`65`	`{`
`66`	`66`	`return QVariant( QVariant::Int );`
`67`	`67`	`}`
	`68`	`+ else`
	`69`	`+ {`
	`70`	`+ return QVariant( QVariant::Invalid );`
	`71`	`+ }`
`68`	`72`	`}`
`69`	`73`
`70`	`74`	`if ( role == Qt::DisplayRole \|\| role == Qt::EditRole )`
`@@ -122,7 +126,14 @@ QVariant QgsFeatureListModel::data( const QModelIndex &index, int role ) const`
`122`	`126`
`123`	`127`	`Qt::ItemFlags QgsFeatureListModel::flags( const QModelIndex &index ) const`
`124`	`128`	`{`
`125`		`- return sourceModel()->flags( mapToSource( index ) ) & ~Qt::ItemIsEditable;`
	`129`	`+ if ( mInjectNull && index.row() == 0 )`
	`130`	`+ {`
	`131`	`+ return Qt::ItemIsSelectable \| Qt::ItemIsEnabled;`
	`132`	`+ }`
	`133`	`+ else`
	`134`	`+ {`
	`135`	`+ return sourceModel()->flags( mapToSource( index ) ) & ~Qt::ItemIsEditable;`
	`136`	`+ }`
`126`	`137`	`}`
`127`	`138`
`128`	`139`	`void QgsFeatureListModel::setInjectNull( bool injectNull )`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,11 @@ void QgsRelationReferenceWidget::setRelationEditable( bool editable )`
`234`	`234`
`235`	`235`	`void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )`
`236`	`236`	`{`
`237`		`- if ( !value.isValid() \|\| value.isNull() )`
	`237`	`+ if ( !value.isValid() )`
	`238`	`+ {`
	`239`	`+ return;`
	`240`	`+ }`
	`241`	`+ if ( value.isNull() )`
`238`	`242`	`{`
`239`	`243`	`deleteForeignKey();`
`240`	`244`	`return;`
`@@ -254,7 +258,6 @@ void QgsRelationReferenceWidget::setForeignKey( const QVariant& value )`
`254`	`258`
`255`	`259`	`if ( !mFeature.isValid() )`
`256`	`260`	`{`
`257`		`- deleteForeignKey();`
`258`	`261`	`return;`
`259`	`262`	`}`
`260`	`263`
`@@ -535,7 +538,8 @@ void QgsRelationReferenceWidget::init()`
`535`	`538`	`}`
`536`	`539`	`}`
`537`	`540`
`538`		`- mComboBox->setCurrentIndex( mComboBox->findData( mFeature.id(), QgsAttributeTableModel::FeatureIdRole ) );`
	`541`	`+ QVariant featId = mFeature.isValid() ? mFeature.id() : QVariant( QVariant::Int );`
	`542`	`+ mComboBox->setCurrentIndex( mComboBox->findData( featId, QgsAttributeTableModel::FeatureIdRole ) );`
`539`	`543`
`540`	`544`	`// Only connect after iterating, to have only one iterator on the referenced table at once`
`541`	`545`	`connect( mComboBox, SIGNAL( currentIndexChanged( int ) ), this, SLOT( comboReferenceChanged( int ) ) );`