yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix breadcrumb for pickers with a startNode

Browse Source
This commit is contained in:
Mads Rasmussen
2017-02-08 11:09:09 +01:00
parent 857063ebd8
commit c060856782
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
View File

@@ -492,19 +492,12 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
angular.forEach(miniListViewsHistory, function(historyItem, index){
if(parseInt(historyItem.node.id) === parseInt(ancestor.id)) {
// load the list view from history
$scope.miniListViews = [];
$scope.miniListViews.push(historyItem);
// remove from history
miniListViewsHistory.splice(index, miniListViewsHistory.length - index);
found = true;
// get ancestors
entityResource.getAncestors(historyItem.node.id, entityType)
.then(function (ancestors) {
$scope.breadcrumb = ancestors;
});
getAncestors(historyItem.node);
found = true;
}
});
@@ -570,10 +563,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
});
// get ancestors
entityResource.getAncestors(node.id, entityType)
.then(function (ancestors) {
$scope.breadcrumb = ancestors;
});
getAncestors(node);
}
@@ -619,6 +609,30 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
}
function getAncestors(node) {
entityResource.getAncestors(node.id, entityType)
.then(function (ancestors) {
// if there is a start node remove all ancestors before that one
if(dialogOptions.startNodeId && dialogOptions.startNodeId !== -1) {
var found = false;
$scope.breadcrumb = [];
angular.forEach(ancestors, function(ancestor){
if(parseInt(ancestor.id) === parseInt(dialogOptions.startNodeId)) {
found = true;
}
if(found) {
$scope.breadcrumb.push(ancestor);
}
});
} else {
$scope.breadcrumb = ancestors;
}
});
}
$scope.getMiniListViewAnimation = function() {
if(goingForward) {
return 'umb-mini-list-view--forward';