Debugging IsVisible WIP

msawczyn · Mar 16, 2020 · 1115f78 · 1115f78
1 parent ca181fd
commit 1115f78
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 63 deletions.
diff --git a/src/Dsl/CustomCode/Partials/AssociationConnector.cs b/src/Dsl/CustomCode/Partials/AssociationConnector.cs
@@ -16,6 +16,8 @@ protected override void InitializeResources(StyleSet classStyleSet)
          AssociateValueWith(Store, Association.TargetDeleteActionDomainPropertyId);
          AssociateValueWith(Store, Association.SourceMultiplicityDomainPropertyId);
          AssociateValueWith(Store, Association.TargetMultiplicityDomainPropertyId);
+         AssociateValueWith(Store, Association.NameDomainPropertyId);
+         AssociateValueWith(Store, Association.FKPropertyNameDomainPropertyId);
          AssociateValueWith(Store, Association.PersistentDomainPropertyId);
       }
 

diff --git a/src/Dsl/CustomCode/Rules/AssociationDeletingRules.cs b/src/Dsl/CustomCode/Rules/AssociationDeletingRules.cs
@@ -19,13 +19,17 @@ public override void ElementDeleting(ElementDeletingEventArgs e)
             return;
 
          ModelAttribute[] fkProperties = element.Dependent.AllAttributes.Where(x => x.IsForeignKeyFor == element.Id).ToArray();
-         WarningDisplay.Show($"Removing foreign key attribute(s) {string.Join(", ", fkProperties.Select(x => x.GetDisplayText()))}");
-
-         foreach (ModelAttribute fkProperty in fkProperties)
+
+         if (fkProperties.Any())
          {
-            fkProperty.ClearFKMods();
-            fkProperty.ModelClass.Attributes.Remove(fkProperty);
-            fkProperty.Delete();
+            WarningDisplay.Show($"Removing foreign key attribute(s) {string.Join(", ", fkProperties.Select(x => x.GetDisplayText()))}");
+
+            foreach (ModelAttribute fkProperty in fkProperties)
+            {
+               fkProperty.ClearFKMods();
+               fkProperty.ModelClass.Attributes.Remove(fkProperty);
+               fkProperty.Delete();
+            }
          }
       }
    }