Fixed editing poly relations

qgis · Jan 18, 2021 · 439e290 · 439e290
1 parent 6dc92b5
commit 439e290
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/src/app/qgsrelationmanagerdialog.cpp b/src/app/qgsrelationmanagerdialog.cpp
@@ -280,7 +280,8 @@ void QgsRelationManagerDialog::mActionEditPolymorphicRelation_triggered()
   if ( rows.size() != 1 )
     return;
 
-  addDlg.setPolymorphicRelation( mRelationsTree->topLevelItem( rows[0].row() )->data( 0, Qt::UserRole ).value<QgsPolymorphicRelation>() );
+  const QgsPolymorphicRelation polyRel = mRelationsTree->topLevelItem( rows[0].row() )->data( 0, Qt::UserRole ).value<QgsPolymorphicRelation>();
+  addDlg.setPolymorphicRelation( polyRel );
 
   if ( addDlg.exec() )
   {
@@ -302,6 +303,19 @@ void QgsRelationManagerDialog::mActionEditPolymorphicRelation_triggered()
     else
       relation.setId( relationId );
 
+    for ( int i = 0, l = mRelationsTree->topLevelItemCount(); i < l; i++ )
+    {
+      mRelationsTree->topLevelItem( i )->data( 0, Qt::UserRole );
+      QgsPolymorphicRelation currentPolyRel = mRelationsTree->topLevelItem( i )->data( 0, Qt::UserRole ).value<QgsPolymorphicRelation>();
+
+      if ( currentPolyRel.id() == polyRel.id() )
+      {
+        // we safely assume that polymorphic relations are always a top level item
+        mRelationsTree->takeTopLevelItem( i );
+        break;
+      }
+    }
+
     addPolymorphicRelation( relation );
   }
 }