From 0c107fd8699577ef1e026fb166311742f6c545e6 Mon Sep 17 00:00:00 2001 From: AndyButland Date: Wed, 25 Mar 2015 21:52:39 +0100 Subject: [PATCH] Ensures footer breadcrumb in content and media returned in correct order --- .../src/views/content/content.edit.controller.js | 2 +- .../src/views/media/media.edit.controller.js | 2 +- src/Umbraco.Web/Editors/EntityController.cs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js index 4f2a259779..03de8af21e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js @@ -37,7 +37,7 @@ function ContentEditController($scope, $rootScope, $routeParams, $q, $timeout, $ if (content.parentId && content.parentId != -1) { entityResource.getAncestors(content.id, "document") .then(function (anc) { - $scope.ancestors = anc.reverse(); + $scope.ancestors = anc; }); } } diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js index 08b269077a..b74cfeb463 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js @@ -71,7 +71,7 @@ function mediaEditController($scope, $routeParams, appState, mediaResource, enti //We fetch all ancestors of the node to generate the footer breadcrump navigation entityResource.getAncestors($routeParams.id, "media") .then(function (anc) { - $scope.ancestors = anc.reverse(); + $scope.ancestors = anc; }); } diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs index b12d19d032..4c1b8dd849 100644 --- a/src/Umbraco.Web/Editors/EntityController.cs +++ b/src/Umbraco.Web/Editors/EntityController.cs @@ -557,6 +557,7 @@ namespace Umbraco.Web.Editors return Services.EntityService.GetAll(objectType.Value, ids) .WhereNotNull() + .OrderBy(x => x.Level) .Select(Mapper.Map); } //now we need to convert the unknown ones