update M2O parse + update single file list value

directus · May 7, 2017 · d276677 · d276677
1 parent 5fa1d42
commit d276677
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/app/core/entries/EntriesModel.js b/app/core/entries/EntriesModel.js
@@ -191,10 +191,13 @@ define(function(require, exports, module) {
               data = _.isObject(attributes[id]) ? attributes[id] : {id: attributes[id]};
             }
 
-            var collectionRelated = EntriesManager.getInstance(tableRelated);
-            var ModelRelated = collectionRelated.model;
+            // only parse the value is not already a model
+            if (!(attributes[id] instanceof Backbone.Model)) {
+              var collectionRelated = EntriesManager.getInstance(tableRelated);
+              var ModelRelated = collectionRelated.model;
 
-            attributes[id] = new ModelRelated(data.data, {collection: collectionRelated});
+              attributes[id] = new ModelRelated(data.data, {collection: collectionRelated});
+            }
 
             break;
         }

diff --git a/app/core/interfaces/single_file/component.js b/app/core/interfaces/single_file/component.js
@@ -55,11 +55,6 @@ define([
     list: function (options) {
       var model = options.value;
 
-      // @TODO: Have this not be hardcoded
-      if (!model.get('type') && model.get(options.schema.id) instanceof Backbone.Model) {
-        model = model.get(options.schema.id);
-      }
-
       var orientation = (parseInt(model.get('width'), 10) > parseInt(model.get('height'), 10)) ? 'landscape' : 'portrait';
       var type = (model.get('type')) ? model.get('type').substring(0, model.get('type').indexOf('/')) : '';
       var subtype = model.getSubType(true);