From 30926a8078c75c5d8c4ed39b053f072940c30d9a Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 7 Jul 2019 14:45:14 +0300 Subject: Removed Deffered delete from ObservableEntity. Added Delete for Cascade Delete. --- .../Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels') diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs index 8772697b6..3811453cb 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs @@ -2024,8 +2024,8 @@ namespace Tango.MachineStudio.Developer.ViewModels _notification.ShowInfo("A job must contain at least one segment."); return; } - ActiveJob.Segments.Remove(x); - x.DefferedDelete(_activeJobDbContext); + + x.Delete(_activeJobDbContext); }); ArrangeSegmentsIndices(); @@ -2075,8 +2075,7 @@ namespace Tango.MachineStudio.Developer.ViewModels LogManager.Log(String.Format("Removing {0} jobs...", SelectedJobs.Count)); SelectedJobs.ToList().ForEach(x => { - SelectedMachine.Jobs.Remove(x); - x.DefferedDelete(_machineDbContext); + x.Delete(_machineDbContext); }); using (_notification.PushTaskItem("Removing selected jobs...")) @@ -2163,7 +2162,6 @@ namespace Tango.MachineStudio.Developer.ViewModels return; } SelectedSegment.BrushStops.Remove(x); - x.DefferedDelete(_activeJobDbContext); }); ArrangeBrushStopsIndices(); -- cgit v1.3.1