Release version 2.2.2

Burgov · May 10, 2014 · a2f4ded · a2f4ded
1 parent f1fc644
commit a2f4ded
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "RRM",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "homepage": "https://github.com/SamsonIT/RRM",
   "authors": [
     "SamsonIT"

diff --git a/build/rrm.js b/build/rrm.js
@@ -45,9 +45,13 @@ var ObjectManager = function(proxyFactory) {
         if (!(entityName in objectMap)) {
             return null;
         }
+
+        var schemaConstructor = entityClassMap[entityName].prototype.$schema.constructor;
+        var idProperty = 'id' in schemaConstructor ? schemaConstructor.id : 'id';
+
         var map = objectMap[entityName];
         for (var i in map) {
-            if (map[i].id == id) {
+            if (map[i][idProperty] == id) {
                 return map[i];
             }
         }
@@ -105,6 +109,10 @@ var ObjectManager = function(proxyFactory) {
     this.loadPropertyValue = function(entity, name, value) {
         var property = entity.$schema[name];
 
+        if (property === undefined) {
+            return;
+        }
+
         entity.$raw[name] = value;
         this.setPropertyValue(entity, name, property.transform(value, this, entity));
     }

diff --git a/build/rrm.min.js b/build/rrm.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "RRM",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Manage relations between entities in JavaScript",
   "main": "build/rrm.js",
   "scripts": {