diff options
| author | Roy <Roy.mail.net@gmail.com> | 2023-01-22 14:45:12 +0200 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2023-01-22 14:45:12 +0200 |
| commit | 180ba6c91451ace9f20bbad8ab4a64c9f25ab83c (patch) | |
| tree | 3331633dcabc57a1a07d20cb28e0880438e0b42a /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs | |
| parent | 0628e2878b0684a389e81ccf485328a1621a08f6 (diff) | |
| parent | dd33d4340a7971a47d782580535ceed0c8e2c4c7 (diff) | |
| download | Tango-180ba6c91451ace9f20bbad8ab4a64c9f25ab83c.tar.gz Tango-180ba6c91451ace9f20bbad8ab4a64c9f25ab83c.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs index 44ba71ac0..fd276ea65 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs @@ -1577,9 +1577,14 @@ namespace Tango.MachineStudio.RML.ViewModels { var json = File.ReadAllText(file); var rmlFile = await Rml.FromRmlFile(db, json); - + db.Rmls.Add(rmlFile); + if (rmlFile.RmlsExtensions != null && rmlFile.RmlsExtensions.Count > 0) + { + db.RmlsExtensions.Add(rmlFile.RmlsExtensions.FirstOrDefault()); + } + _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.RmlImported, _authentication.CurrentUser, rmlFile.Name, rmlFile, "RML imported from Machine Studio."); } |