Added fix for injecting relations on updated (re-injected) resources.

Author: OverZealous

dist/angular-data.js

@@ -6697,6 +6697,11 @@ function _inject(definition, resource, attrs, options) {
           }
         } else {
           DS.utils.deepMixIn(item, attrs);
+          if (definition.relations && !item.$$angularData$$hasInjected) {
+            item.$$angularData$$hasInjected = true;
+            _injectRelations.call(DS, definition, item, options);
+            delete item.$$angularData$$hasInjected;
+          }
           if (definition.resetHistoryOnInject) {
             resource.previousAttributes[id] = {};
             DS.utils.deepMixIn(resource.previousAttributes[id], attrs);

dist/angular-data.min.js

@@ -147,6 +147,11 @@ function _inject(definition, resource, attrs, options) {
           }
         } else {
           DS.utils.deepMixIn(item, attrs);
+          if (definition.relations && !item.$$angularData$$hasInjected) {
+            item.$$angularData$$hasInjected = true;
+            _injectRelations.call(DS, definition, item, options);
+            delete item.$$angularData$$hasInjected;
+          }
           if (definition.resetHistoryOnInject) {
             resource.previousAttributes[id] = {};
             DS.utils.deepMixIn(resource.previousAttributes[id], attrs);

src/datastore/sync_methods/inject.js

@@ -197,6 +197,30 @@ describe('DS.inject(resourceName, attrs[, options])', function () {
     // profile21 relations
     assert.deepEqual(angular.toJson(DS.get('user', 22)), angular.toJson(DS.get('profile', 21).user));
   });
+  it('should inject relations on update', function () {
+    var userToInject = user18,
+        userId = userToInject.id,
+        orgToInject = organization15,
+        orgId = orgToInject.id;
+
+    // can inject items with relations
+    DS.inject('user', userToInject);
+    DS.inject('organization', orgToInject);
+
+    var user = DS.get('user', userId);
+    var org = DS.get('organization', orgId);
+
+    assert.strictEqual(user.organizationId, org.id);
+    assert.strictEqual(org.users[2], user);
+
+    // can safely RE-inject these items, too
+    DS.inject('user', angular.extend({organization: orgToInject}, userToInject));
+    DS.inject('organization', orgToInject);
+
+    assert.strictEqual(DS.get('user', userId), user);
+    assert.strictEqual(user.organization, org);
+    assert.strictEqual(org.users[2], user);
+  });
   it('should find inverse links', function () {
     DS.inject('user', { organizationId: 5, id: 1 });