Merge pull request #557 from opengisch/fix_multiple_relationeditors

Multiple Relation Editor Widgets per connection
opengisch · Oct 8, 2021 · 0d7d420 · 0d7d420
2 parents 73cc61a + 0489b6f
commit 0d7d420
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/QgisModelBaker/libqgsprojectgen/dataobjects/layers.py b/QgisModelBaker/libqgsprojectgen/dataobjects/layers.py
@@ -200,30 +200,31 @@ def post_generate(self, project):
 
                     # 1:m relation will be added only if does not point to a pure link table
                     if (
-                        not (
-                            relation.referencing_layer.isPureLinkTable(project)
-                            or relation.referencing_layer.is_basket_table
-                        )
+                        not relation.referencing_layer.isPureLinkTable(project)
                         or Qgis.QGIS_VERSION_INT < 31600
                     ):
                         relations_to_add.append((relation, None))
 
-                    for nm_relation in project.relations:
-                        if nm_relation == relation:
-                            continue
+                    else:
+                        for nm_relation in project.relations:
+                            if nm_relation == relation:
+                                continue
 
-                        if nm_relation.referenced_layer == self:
-                            continue
+                            if nm_relation.referenced_layer == self:
+                                continue
 
-                        # relations to the same table with different geometries should not be added
-                        if nm_relation.referenced_layer.srid == self.srid:
-                            continue
+                            # relations to the same table with different geometries should not be added
+                            if nm_relation.referenced_layer.srid == self.srid:
+                                continue
 
-                        if nm_relation.referenced_layer.is_basket_table:
-                            continue
+                            if nm_relation.referenced_layer.is_basket_table:
+                                continue
 
-                        if nm_relation.referencing_layer == relation.referencing_layer:
-                            relations_to_add.append((relation, nm_relation))
+                            if (
+                                nm_relation.referencing_layer
+                                == relation.referencing_layer
+                            ):
+                                relations_to_add.append((relation, nm_relation))
 
             for relation, nm_relation in relations_to_add:
                 if nm_relation and Qgis.QGIS_VERSION_INT < 31600: