fix adding relation with multiple field pairs from dialog (#37640)

qgis · Jul 7, 2020 · ed000d4 · ed000d4
1 parent d14b349
commit ed000d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/app/qgsrelationadddlg.cpp b/src/app/qgsrelationadddlg.cpp
@@ -239,6 +239,8 @@ QList< QPair< QString, QString > > QgsRelationAddDlg::references()
   QList< QPair< QString, QString > > references;
   for ( int i = 0; i < mFieldPairWidgets.count(); i++ )
   {
+    if ( !mFieldPairWidgets.at( i )->isPairEnabled() )
+      continue;
     QString referencingField = mFieldPairWidgets.at( i )->referencingField();
     QString referencedField = mFieldPairWidgets.at( i )->referencedField();
     references << qMakePair( referencingField, referencedField );

diff --git a/src/app/qgsrelationmanagerdialog.cpp b/src/app/qgsrelationmanagerdialog.cpp
@@ -138,7 +138,9 @@ void QgsRelationManagerDialog::mBtnAddRelation_clicked()
       ++suffix;
     }
     relation.setId( relationId );
-    relation.addFieldPair( addDlg.references().at( 0 ).first, addDlg.references().at( 0 ).second );
+    const auto references = addDlg.references();
+    for ( const auto &reference : references )
+      relation.addFieldPair( reference.first, reference.second );
     relation.setName( addDlg.relationName() );
     relation.setStrength( addDlg.relationStrength() );