Fix merge dialog using default clause instead of feature id

domi4484 · github-actions[bot] · commit 61b4be827da3 · 2023-04-21T09:08:41.000Z
diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp
@@ -233,7 +233,13 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
   {
     int idx = mTableWidget->horizontalHeaderItem( j )->data( FieldIndex ).toInt();
     bool setToManual = false;
-    if ( !mVectorLayer->dataProvider()->defaultValueClause( idx ).isEmpty() )
+
+    // For the Id use the target feature
+    if ( j == 0 )
+    {
+      mTableWidget->item( mTableWidget->rowCount() - 1, j )->setData( Qt::DisplayRole, mTargetFeatureId );
+    }
+    else if ( !mVectorLayer->dataProvider()->defaultValueClause( idx ).isEmpty() )
     {
       mTableWidget->item( mTableWidget->rowCount() - 1, j )->setData( Qt::DisplayRole, mVectorLayer->dataProvider()->defaultValueClause( idx ) );
       setToManual = true;
diff --git a/tests/src/app/testqgsmergeattributesdialog.cpp b/tests/src/app/testqgsmergeattributesdialog.cpp
@@ -86,10 +86,12 @@ class TestQgsMergeattributesDialog : public QObject
 
       // At beginnning the first feature of the list is the target
       QCOMPARE( dialog.targetFeatureId(), f1.id() );
+      QCOMPARE( dialog.mergedAttributes().first(), f1.id() );
 
       // Check after taking feature with largest geometry
       QVERIFY( QMetaObject::invokeMethod( &dialog, "mFromLargestPushButton_clicked" ) );
       QCOMPARE( dialog.targetFeatureId(), f2.id() );
+      QCOMPARE( dialog.mergedAttributes().first(), f2.id() );
     }
 };
 
