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

Merge remote-tracking branch 'origin/temp8' into temp8-logviewer

Browse Source
This commit is contained in:
Warren Buckley
2018-11-14 10:09:49 +00:00
parent 8f6af7b41e 5c255ba846
commit 23c4f88ce7
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
View File

@@ -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];

8
src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js
View File

@@ -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();
}