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

start looking at tree service to remove a node but realized that our initial app tree loading isn't correct, we need to have a true root node but currently we dont.

Browse Source
This commit is contained in:
Shannon
2013-07-15 17:05:54 +10:00
parent f2b28e6bfb
commit 7926318709
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,16 +13,22 @@ function treeService($q, treeResource, iconHelper) {
var currentSection = "content";
/** ensures there's a view and level property on each tree node */
function ensureLevelAndView(treeNodes, section, level) {
function ensureParentLevelAndView(parentNode, treeNodes, section, level) {
//if no level is set, then we make it 1
var childLevel = (level ? level : 1);
for (var i = 0; i < treeNodes.length; i++) {
treeNodes[i].level = childLevel;
treeNodes[i].view = section + "/edit/" + treeNodes[i].id;
treeNodes[i].parent = parentNode;
}
}
return {
removeNode: function(treeNode) {
var asdf = treeNode;
},
getTree: function (options) {
if(options === undefined){
@@ -47,7 +53,7 @@ function treeService($q, treeResource, iconHelper) {
children: data
};
//ensure the view is added to each tree node
ensureLevelAndView(result.children, section);
ensureParentLevelAndView(null, result.children, section);
//cache this result
//TODO: We'll need to un-cache this in many circumstances
treeArray[cacheKey] = result;
@@ -135,7 +141,7 @@ function treeService($q, treeResource, iconHelper) {
return treeResource.loadNodes({ section: section, node: treeItem })
.then(function(data) {
//now that we have the data, we need to add the level property to each item and the view
ensureLevelAndView(data, section, treeItem.level + 1);
ensureParentLevelAndView(treeItem, data, section, treeItem.level + 1);
return data;
});
}

3
src/Umbraco.Web.UI.Client/src/views/content/contentdelete.controller.js
View File

@@ -6,13 +6,14 @@
* @description
* The controller for deleting content
*/
function ContentDeleteController($scope, contentResource) {
function ContentDeleteController($scope, contentResource, treeService) {
$scope.performDelete = function() {
contentResource.deleteById($scope.currentNode.id).then(function () {
//TODO: Need to sync tree, etc...
alert("Deleted!");
treeService.removeNode($scope.currentNode);
$scope.hideMenu();
});