editor note references

app/assets/javascripts/app/services/modelManager.js

@@ -59,7 +59,9 @@ class ModelManager {
   }
 
   mapResponseItemsToLocalModelsOmittingFields(items, omitFields) {
-    var models = [];
+    var models = [], processedObjects = [];
+
+    // first loop should add and process items
     for (var json_obj of items) {
       json_obj = _.omit(json_obj, omitFields || [])
       var item = this.findItem(json_obj["uuid"]);
@@ -80,11 +82,16 @@ class ModelManager {
 
       this.addItem(item);
 
-      if(json_obj.content) {
-        this.resolveReferencesForItem(item);
-      }
-
       models.push(item);
+      processedObjects.push(json_obj);
+    }
+
+    // second loop should process references
+    for (var index in processedObjects) {
+      var json_obj = processedObjects[index];
+      if(json_obj.content) {
+        this.resolveReferencesForItem(models[index]);
+      }
     }
 
     this.notifySyncObserversOfModels(models);
@@ -174,6 +181,7 @@ class ModelManager {
       return;
     }
 
+
     for(var reference of contentObject.references) {
       var referencedItem = this.findItem(reference.uuid);
       if(referencedItem) {

app/assets/javascripts/app/services/syncManager.js

@@ -187,7 +187,6 @@ class SyncManager {
       var saved = this.handleItemsResponse(response.saved_items, omitFields);
 
       this.handleUnsavedItemsResponse(response.unsaved)
-
       this.writeItemsToLocalStorage(saved, false, null);
       this.writeItemsToLocalStorage(retrieved, false, null);