merge

1 files changed, 4 insertions, 27 deletions

diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
index 7b90623d8..a94ed85a0 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineVersion.cs
@@ -27,40 +27,22 @@ namespace Tango.BL.Entities
                 .Ignore(() => machine.MachinesEvents)
                 .Ignore(() => machine.Configuration.Machines)
                 .Ignore(() => machine.Jobs)
-                .Ignore(() => machine.SerialNumber)
-                .Ignore(() => machine.DefaultRmlGuid)
-                .Ignore(() => machine.DefaultColorSpaceGuid)
-                .Ignore(() => machine.DefaultSpoolTypeGuid)
-                .Ignore(() => machine.LoadedRmlGuid)
-                .Ignore(() => machine.DeviceId)
-                .Ignore(() => machine.DeviceName)
-                .Ignore(() => machine.IsDeviceRegistered)
-                .Ignore(() => machine.SiteGuid),
+                .Ignore(() => machine.SerialNumber),
                 
                 EntitySerializationFlags.IgnoreGuids | EntitySerializationFlags.IgnoreReferenceTypes);
         }
 
-        public async Task<Machine> CreatePrototypeMachine(ObservablesContext context)
+        public Machine CreatePrototypeMachine(ObservablesContext context)
         {
             Machine m = new Machine();
 
-            String protoTypeData = (await context.MachineVersions.SingleOrDefaultAsync(x => x.Guid == Guid)).PrototypeMachineData;
-
-            Machine machine = Machine.FromJson(protoTypeData, new EntitySerializationStrategy()
+            Machine machine = Machine.FromJson(PrototypeMachineData, new EntitySerializationStrategy()
                 .Include(() => m.Configuration)
                 .Ignore(() => m.Name)
                 .Ignore(() => m.MachinesEvents)
                 .Ignore(() => m.Configuration.Machines)
                 .Ignore(() => m.Jobs)
-                .Ignore(() => m.SerialNumber)
-                .Ignore(() => m.DefaultRmlGuid)
-                .Ignore(() => m.DefaultColorSpaceGuid)
-                .Ignore(() => m.DefaultSpoolTypeGuid)
-                .Ignore(() => m.LoadedRmlGuid)
-                .Ignore(() => m.DeviceId)
-                .Ignore(() => m.DeviceName)
-                .Ignore(() => m.IsDeviceRegistered)
-                .Ignore(() => m.SiteGuid),
+                .Ignore(() => m.SerialNumber),
 
                 EntitySerializationFlags.IgnoreGuids | EntitySerializationFlags.IgnoreReferenceTypes);
 
@@ -69,7 +51,6 @@ namespace Tango.BL.Entities
             machine.ConfigurationGuid = null;
             machine.ConfigurationGuid = machine.Configuration.Guid;
 
-
             foreach (var cat in machine.Cats)
             {
                 cat.MachineGuid = machine.Guid;
@@ -89,10 +70,6 @@ namespace Tango.BL.Entities
                 spool.MachineGuid = machine.Guid;
             }
 
-            machine.DefaultColorSpaceGuid = null;
-            machine.DefaultRmlGuid = null;
-            machine.DefaultSpoolTypeGuid = null;
-
             return machine;
         }