diff options
| author | Mirta <mirta@twine-s.com> | 2021-05-23 18:06:59 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2021-05-23 18:06:59 +0300 |
| commit | 73c58af360f611fb64360436826b9ed3a0c12719 (patch) | |
| tree | 4cea665e59dff3f2ec3998dafd0e3fcfc38a2548 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner | |
| parent | a4a3dd0bca2237e5fce150191f85fa1009d42174 (diff) | |
| parent | 59337c44830916d106ee98e892f7c3f95780a011 (diff) | |
| download | Tango-73c58af360f611fb64360436826b9ed3a0c12719.tar.gz Tango-73c58af360f611fb64360436826b9ed3a0c12719.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index 4b5d0897d..00ee4f3bd 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -870,6 +870,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels { IsFree = false; + var selectedMachine = SelectedMachine; + using (ObservablesContext db = ObservablesContext.CreateDefault()) { var machineToDelete = await new MachineBuilder(db).Set(SelectedMachine.Guid).WithConfiguration().BuildAsync(); @@ -884,14 +886,14 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels } } - await LoadMachines(); + _actionLogManager.InsertLog(ActionLogType.MachineDeleted, _authentication.CurrentUser, selectedMachine.Name, machineToDelete, "Machine deleted using Machine Studio."); - _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.MachineDeleted, _authentication.CurrentUser, SelectedMachine.Name, machineToDelete, "Machine deleted using Machine Studio."); + await LoadMachines(); } } catch (Exception ex) { - LogManager.Log(ex, $"Error removing machine selected machine."); + LogManager.Log(ex, $"Error removing selected machine."); _notification.ShowError($"An error occurred while trying to delete the selected machine.\n{ex.Message}"); } finally |