From dfa58183c69e46f8600a7fd38c08d7a144791238 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 21 Mar 2017 18:38:54 +1100 Subject: [PATCH] Fixes deleting partial view and script files --- .../src/views/partialviewmacros/delete.controller.js | 6 ++---- .../src/views/partialviews/delete.controller.js | 6 ++---- .../src/views/scripts/delete.controller.js | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.controller.js index 9789467827..02b89dd279 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.controller.js @@ -12,10 +12,8 @@ function PartialViewMacrosDeleteController($scope, codefileResource, treeService //mark it for deletion (used in the UI) $scope.currentNode.loading = true; - - var virtualPath = $scope.currentNode.parentId + $scope.currentNode.name; - - codefileResource.deleteByPath('partialViewMacros', virtualPath) + + codefileResource.deleteByPath('partialViewMacros', $scope.currentNode.id) .then(function() { $scope.currentNode.loading = false; //get the root node before we remove it diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js index d6645df558..b25ac3c7b8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js @@ -12,10 +12,8 @@ function PartialViewsDeleteController($scope, codefileResource, treeService, nav //mark it for deletion (used in the UI) $scope.currentNode.loading = true; - - var virtualPath = $scope.currentNode.parentId + $scope.currentNode.name; - - codefileResource.deleteByPath('partialViews', virtualPath) + + codefileResource.deleteByPath('partialViews', $scope.currentNode.id) .then(function() { $scope.currentNode.loading = false; //get the root node before we remove it diff --git a/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js index f23fa9367b..82c11a2242 100644 --- a/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js @@ -12,10 +12,8 @@ function ScriptsDeleteController($scope, codefileResource, treeService, navigati //mark it for deletion (used in the UI) $scope.currentNode.loading = true; - - var virtualPath = $scope.currentNode.parentId + $scope.currentNode.name; - - codefileResource.deleteByPath('scripts', virtualPath) + + codefileResource.deleteByPath('scripts', $scope.currentNode.id) .then(function() { $scope.currentNode.loading = false; //get the root node before we remove it