Amend contentModel._children to allow for arrays

Fix #1719
adaptlearning · Oct 16, 2017 · f54d501 · f54d501
1 parent 4004e21
commit f54d501
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/frontend/src/core/helpers.js b/frontend/src/core/helpers.js
@@ -314,13 +314,14 @@ define(function(require){
             if (currentChildren.length == 0) {
               containsAtLeastOneChild = false;
 
+              var children = _.isArray(model._children) ? model._children.join('/') : model._children;
               alerts.push(
                 "There seems to be a "
                 + model.get('_type')
                 + " with the title - '"
                 + model.get('title')
                 + "' with no "
-                + model._children
+                + children
               );
 
               return;

diff --git a/frontend/src/core/models/contentModel.js b/frontend/src/core/models/contentModel.js
@@ -21,12 +21,28 @@ define(function(require) {
     },
 
     getChildren: function() {
-      if (Origin.editor.data[this._children]) {
-        var children = Origin.editor.data[this._children].where({ _parentId: this.get('_id') });
-        var childrenCollection = new Backbone.Collection(children);
-        return childrenCollection;
+      var self = this;
+      var getChildrenDelegate = function(type) {
+        if (Origin.editor.data[type]) {
+          var children = Origin.editor.data[type].where({ _parentId: self.get('_id') });
+          var childrenCollection = new Backbone.Collection(children);
+          return childrenCollection;
+        }
+        return null;
+      };
+      if(_.isArray(this._children)) {
+        var allChildren;
+        for(var i = 0, count = this._children.length; i < count; i++) {
+          var children = getChildrenDelegate(this._children[i]);
+          if(children) {
+            if(!allChildren) allChildren = children;
+            else allChildren.add(children.models);
+          }
+        }
+        return allChildren;
+      } else {
+        return getChildrenDelegate(this._children);
       }
-      return null;
     },
 
     getParent: function() {

diff --git a/frontend/src/core/models/contentObjectModel.js b/frontend/src/core/models/contentObjectModel.js
@@ -6,8 +6,8 @@ define(function(require) {
   var ContentObjectModel = ContentModel.extend({
     urlRoot: '/api/content/contentobject',
     _parent: 'contentObjects',
-    _siblings:'contentObjects',
-    _children: 'articles',
+    _siblings: 'contentObjects',
+    _children: ['contentObjects', 'articles'],
 
     defaults: {
       _isSelected: false,