Merge branch '1.13' into 2.1

ezecosystem · Jun 20, 2018 · 0ab4ad1 · 0ab4ad1
2 parents dd7b75a + 0526298
commit 0ab4ad1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/Resources/public/js/views/services/plugins/ez-objectrelationsloadplugin.js b/Resources/public/js/views/services/plugins/ez-objectrelationsloadplugin.js
@@ -48,6 +48,7 @@ YUI.add('ez-objectrelationsloadplugin', function (Y) {
                 loadingError = false,
                 sourceContent = e.content,
                 destinationContentIds = e.destinationContentIds,
+                withLocation = e.loadLocation || e.loadLocationPath,
                 contentDestinations,
                 end = stack.add(function (error, struct) {
                     if (error) {
@@ -77,7 +78,7 @@ YUI.add('ez-objectrelationsloadplugin', function (Y) {
                 if (!loadedRelation[value]) {
                     loadedRelation[value] = true;
 
-                    if (e.loadLocation || e.loadLocationPath) {
+                    if (withLocation) {
                         this._loadContentStruct(value, e.loadLocation, e.loadLocationPath, end);
                     } else {
                         this._loadContent(value, end);
@@ -86,6 +87,21 @@ YUI.add('ez-objectrelationsloadplugin', function (Y) {
             }, this);
 
             stack.done(function () {
+                relatedContentListArray.sort(function (a, b) {
+                    var indexA,
+                        indexB;
+
+                    if (withLocation) {
+                        a = a.content;
+                        b = b.content;
+                    }
+
+                    indexA = destinationContentIds.indexOf(a.get('id'));
+                    indexB = destinationContentIds.indexOf(b.get('id'));
+
+                    return indexA - indexB;
+                });
+
                 e.target.setAttrs({
                     relatedContents: relatedContentListArray,
                     loadingError: loadingError,

diff --git a/Tests/js/views/services/plugins/assets/ez-objectrelationsloadplugin-tests.js b/Tests/js/views/services/plugins/assets/ez-objectrelationsloadplugin-tests.js
@@ -13,6 +13,7 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
             this.Content = function () {
                 this.set = tests._set;
                 this.load = tests._load;
+                this.get = tests._get;
             };
             this.destination1 = '/api/ezp/v2/content/objects/117';
             this.destination2 = '/api/ezp/v2/content/objects/118';
@@ -62,6 +63,10 @@ YUI.add('ez-objectrelationsloadplugin-tests', function (Y) {
             this.id = value;
         },
 
+        _get: function (name) {
+
+        },
+
         _load: function (options, callback) {
 
         },