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

Updates code for U4-6579 with equals check and adds logic to the content editor too

Browse Source
This commit is contained in:
Shannon
2015-06-26 10:01:32 +02:00
parent aa9751afff
commit acf7fa7907
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
View File

@@ -31,7 +31,13 @@ function ContentDeleteController($scope, contentResource, treeService, navigatio
//if the current edited item is the same one as we're deleting, we need to navigate elsewhere
if (editorState.current && editorState.current.id == $scope.currentNode.id) {
$location.path("/content/content/edit/" + $scope.currentNode.parentId);
//If the deleted item lived at the root then just redirect back to the root, otherwise redirect to the item's parent
var location = "/content";
if ($scope.currentNode.parentId !== -1)
location = "/content/content/edit/" + $scope.currentNode.parentId;
$location.path(location);
}
navigationService.hideMenu();

2
src/Umbraco.Web.UI.Client/src/views/media/media.delete.controller.js
View File

@@ -34,7 +34,7 @@ function MediaDeleteController($scope, mediaResource, treeService, navigationSer
//If the deleted item lived at the root then just redirect back to the root, otherwise redirect to the item's parent
var location = "/media";
if ($scope.currentNode.parentId != -1)
if ($scope.currentNode.parentId !== -1)
location = "/media/media/edit/" + $scope.currentNode.parentId;
$location.path(location);