ObservablesContext is now LazyLoading = 'false' by default.

1 files changed, 20 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs
index d6cdcfb16..1b69a8bdb 100644
--- a/Software/Visual_Studio/Tango.BL/ObservableEntity.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservableEntity.cs
@@ -157,7 +157,26 @@ namespace Tango.BL
         /// </summary>
         public virtual void Save(ObservablesContext context)
         {
-            context.SaveChanges();
+            if (context == ObservablesEntitiesAdapter.Instance.Context)
+            {
+                var tableName = this.GetType().GetCustomAttribute<TableAttribute>().Name;
+
+                String propName = tableName.FromDalNameToTitleCase();
+
+                DbSet<T> set = ObservablesEntitiesAdapter.Instance.Context.GetType().GetProperty(propName, BindingFlags.Instance | BindingFlags.Public).GetValue(context) as DbSet<T>;
+                ObservableCollection<T> obs = ObservablesEntitiesAdapter.Instance.GetType().GetProperty(propName, BindingFlags.Instance | BindingFlags.Public).GetValue(ObservablesEntitiesAdapter.Instance) as ObservableCollection<T>;
+
+                if (!obs.Contains(this as T))
+                {
+                    set.Add(this as T);
+                }
+
+                ObservablesEntitiesAdapter.Instance.SaveChanges();
+            }
+            else
+            {
+                context.SaveChanges();
+            }
         }
 
         /// <summary>