From 9237480acad6de5cbeb04e87db11a0690f370167 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 7 Nov 2018 08:21:43 +0100 Subject: [PATCH 1/2] Bugfix: The root could not be found in getDescendantNode, when the treeAlias was not in the first child. --- .../src/common/services/tree.service.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js index d5f479b884..aae6e43650 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js @@ -414,7 +414,12 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS for (var c = 0; c < tn.children.length; c++) { if (tn.children[c].isContainer) { //recurse - return getTreeRoot(tn.children[c]); + var root = getTreeRoot(tn.children[c]); + + //only return if we found the root in this child, otherwise continue. + if(root){ + return root; + } } else if (self.getTreeAlias(tn.children[c]) === treeAlias) { return tn.children[c]; From 3e50ef694d1beb3c7321c4193a533e9ff2984d06 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 7 Nov 2018 08:42:22 +0100 Subject: [PATCH 2/2] Change sections on views for partial view macros --- .../src/views/partialviewmacros/create.controller.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js index c72df3c15e..73a7ea3722 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js @@ -52,23 +52,23 @@ }, function (err) { vm.createFolderError = err; - + }); } } function createFile() { - $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true"); + $location.path("/settings/partialviewmacros/edit/" + node.id).search("create", "true"); navigationService.hideMenu(); } function createFileWithoutMacro() { - $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("nomacro", "true"); + $location.path("/settings/partialviewmacros/edit/" + node.id).search("create", "true").search("nomacro", "true"); navigationService.hideMenu(); } function createFileFromSnippet(snippet) { - $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("snippet", snippet.fileName); + $location.path("/settings/partialviewmacros/edit/" + node.id).search("create", "true").search("snippet", snippet.fileName); navigationService.hideMenu(); }