previous one again

IdeaBlade · Sep 26, 2012 · 69e8ee9 · 69e8ee9
1 parent ff0cf00
commit 69e8ee9
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 8 deletions.
diff --git a/Breeze.Client/Scripts/breeze.debug.js b/Breeze.Client/Scripts/breeze.debug.js
@@ -10243,7 +10243,7 @@ function (core, m_entityAspect, m_entityMetadata, m_entityManager, m_entityQuery
 define('root',["core", "entityModel"],
 function (core, entityModel) {
     var root = {
-        version: "0.58",
+        version: "0.59",
         core: core,
         entityModel: entityModel
     };

diff --git a/Breeze.WebApi/Breeze.WebApi.dll b/Breeze.WebApi/Breeze.WebApi.dll
diff --git a/Breeze.WebApi/EFContextProvider.cs b/Breeze.WebApi/EFContextProvider.cs
@@ -5,6 +5,7 @@
 using System.Data;
 using System.Data.Entity;
 using System.Data.Entity.Infrastructure;
+using System.Data.EntityClient;
 using System.Data.Metadata.Edm;
 using System.Data.Objects;
 using System.Globalization;
@@ -17,9 +18,6 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
-using System.Text;
-using System.Web;
-using System.Data.EntityClient;
 
 namespace Breeze.WebApi {
 
@@ -119,6 +117,13 @@ public class EFContextProvider<T> where T : class, new() {
       return new SaveResult() {Entities = entities, KeyMappings = keyMappings};
     }
 
+    /// <summary>
+    /// The method is called for each entity to be saved before the save occurs.  If this method returns 'false'
+    /// then the entity will be excluded from the save. There is no need to call the base implementation of this
+    /// method when overriding it. 
+    /// </summary>
+    /// <param name="entityInfo"></param>
+    /// <returns></returns>
     public virtual bool BeforeSaveEntity(EntityInfo entityInfo) {
       return true;
     }
@@ -176,7 +181,6 @@ public class EFContextProvider<T> where T : class, new() {
     #region Save related methods
 
     private List<EntityInfo> ProcessSaves(Dictionary<Type, List<EntityInfo>> saveMap) {
-      saveMap = BeforeSaveEntities(saveMap);
       var deletedEntities = new List<EntityInfo>();
       foreach (var kvp in saveMap) {
         var entityType = kvp.Key;

diff --git a/BuildPutFtp.ps1 b/BuildPutFtp.ps1
diff --git a/DocCode/BreezeDocCode/Scripts/lib/breeze.debug.js b/DocCode/BreezeDocCode/Scripts/lib/breeze.debug.js
@@ -10243,7 +10243,7 @@ function (core, m_entityAspect, m_entityMetadata, m_entityManager, m_entityQuery
 define('root',["core", "entityModel"],
 function (core, entityModel) {
     var root = {
-        version: "0.58",
+        version: "0.59",
         core: core,
         entityModel: entityModel
     };

diff --git a/DocCode/BreezeDocCode/ThirdParty/Breeze.WebApi.dll b/DocCode/BreezeDocCode/ThirdParty/Breeze.WebApi.dll
diff --git a/Samples/Todo/Todo/Scripts/lib/breeze.debug.js b/Samples/Todo/Todo/Scripts/lib/breeze.debug.js
@@ -10243,7 +10243,7 @@ function (core, m_entityAspect, m_entityMetadata, m_entityManager, m_entityQuery
 define('root',["core", "entityModel"],
 function (core, entityModel) {
     var root = {
-        version: "0.58",
+        version: "0.59",
         core: core,
         entityModel: entityModel
     };

diff --git a/Samples/Todo/Todo/ThirdParty/Breeze.WebApi.dll b/Samples/Todo/Todo/ThirdParty/Breeze.WebApi.dll
diff --git a/_Internal/Sample_WebApi/Controllers/NorthwindIBModelController.cs b/_Internal/Sample_WebApi/Controllers/NorthwindIBModelController.cs
@@ -1,6 +1,7 @@
 #define DBCONTEXT_PROVIDER 
 // 
 using System;
+using System.Data;
 using System.Linq;
 using System.Web.Http;
 using Breeze.WebApi;
@@ -27,7 +28,12 @@ public class NorthwindContextProvider: EFContextProvider<NorthwindIBContext_EDMX
 
 
     public override bool BeforeSaveEntity(EntityInfo entityInfo) {
-      return true;
+      // prohibit any additions of entities of type 'Role'
+      if (entityInfo.Entity.GetType() == typeof(Role) && entityInfo.EntityState == EntityState.Added) {
+        return false;
+      } else {
+        return true;
+      }
     }
 
     public override Dictionary<Type, List<EntityInfo>> BeforeSaveEntities(Dictionary<Type, List<EntityInfo>> saveMap) {

diff --git a/testFile.txt b/testFile.txt
@@ -0,0 +1 @@
+ASDaasdfasdfasd