Respect default values in N:M relations

m-kuhn · m-kuhn · commit e5187b2946c6 · 2017-11-07T14:53:51.000+01:00
diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
@@ -28,6 +28,7 @@
 #include "qgsproject.h"
 #include "qgstransactiongroup.h"
 #include "qgslogger.h"
+#include "qgsvectorlayerutils.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
@@ -351,19 +352,28 @@ void QgsRelationEditorWidget::linkFeature()
       QgsFeature relatedFeature;
 
       QgsFeatureList newFeatures;
-      QgsFeature linkFeature( mRelation.referencingLayer()->fields() );
 
+      // Fields of the linking table
+      const QgsFields fields = mRelation.referencingLayer()->fields();
+
+      // Expression context for the linking table
+      QgsExpressionContext context = mRelation.referencingLayer()->createExpressionContext();
+
+      QgsAttributeMap linkAttributes;
       Q_FOREACH ( const QgsRelation::FieldPair &fieldPair, mRelation.fieldPairs() )
       {
-        linkFeature.setAttribute( fieldPair.first, mFeature.attribute( fieldPair.second ) );
+        int index = fields.indexOf( fieldPair.first );
+        linkAttributes.insert( index,  mFeature.attribute( fieldPair.second ) );
       }
 
       while ( it.nextFeature( relatedFeature ) )
       {
         Q_FOREACH ( const QgsRelation::FieldPair &fieldPair, mNmRelation.fieldPairs() )
         {
-          linkFeature.setAttribute( fieldPair.first, relatedFeature.attribute( fieldPair.second ) );
+          int index = fields.indexOf( fieldPair.first );
+          linkAttributes.insert( index, relatedFeature.attribute( fieldPair.second ) );
         }
+        const QgsFeature linkFeature = QgsVectorLayerUtils::createFeature( mRelation.referencingLayer(), QgsGeometry(), linkAttributes, &context );
 
         newFeatures << linkFeature;
       }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`#include "qgsproject.h"`
`29`	`29`	`#include "qgstransactiongroup.h"`
`30`	`30`	`#include "qgslogger.h"`
	`31`	`+#include "qgsvectorlayerutils.h"`
`31`	`32`
`32`	`33`	`#include <QHBoxLayout>`
`33`	`34`	`#include <QLabel>`
`@@ -351,19 +352,28 @@ void QgsRelationEditorWidget::linkFeature()`
`351`	`352`	`QgsFeature relatedFeature;`
`352`	`353`
`353`	`354`	`QgsFeatureList newFeatures;`
`354`		`- QgsFeature linkFeature( mRelation.referencingLayer()->fields() );`
`355`	`355`
	`356`	`+ // Fields of the linking table`
	`357`	`+ const QgsFields fields = mRelation.referencingLayer()->fields();`
	`358`	`+`
	`359`	`+ // Expression context for the linking table`
	`360`	`+ QgsExpressionContext context = mRelation.referencingLayer()->createExpressionContext();`
	`361`	`+`
	`362`	`+ QgsAttributeMap linkAttributes;`
`356`	`363`	`Q_FOREACH ( const QgsRelation::FieldPair &fieldPair, mRelation.fieldPairs() )`
`357`	`364`	`{`
`358`		`- linkFeature.setAttribute( fieldPair.first, mFeature.attribute( fieldPair.second ) );`
	`365`	`+ int index = fields.indexOf( fieldPair.first );`
	`366`	`+ linkAttributes.insert( index, mFeature.attribute( fieldPair.second ) );`
`359`	`367`	`}`
`360`	`368`
`361`	`369`	`while ( it.nextFeature( relatedFeature ) )`
`362`	`370`	`{`
`363`	`371`	`Q_FOREACH ( const QgsRelation::FieldPair &fieldPair, mNmRelation.fieldPairs() )`
`364`	`372`	`{`
`365`		`- linkFeature.setAttribute( fieldPair.first, relatedFeature.attribute( fieldPair.second ) );`
	`373`	`+ int index = fields.indexOf( fieldPair.first );`
	`374`	`+ linkAttributes.insert( index, relatedFeature.attribute( fieldPair.second ) );`
`366`	`375`	`}`
	`376`	`+ const QgsFeature linkFeature = QgsVectorLayerUtils::createFeature( mRelation.referencingLayer(), QgsGeometry(), linkAttributes, &context );`
`367`	`377`
`368`	`378`	`newFeatures << linkFeature;`
`369`	`379`	`}`