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

Fix the changing source name when moving a node

Browse Source
This commit is contained in:
Kenn Jacobsen
2018-11-25 13:35:14 +01:00
committed by Sebastiaan Janssen
parent a072278490
commit 9b4a580734
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,11 +22,11 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
$scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1;
});
var node = $scope.currentNode;
$scope.source = _.clone($scope.currentNode);
function treeLoadedHandler(args) {
if (node && node.path) {
$scope.dialogTreeApi.syncTree({ path: node.path, activate: false });
if ($scope.source && $scope.source.path) {
$scope.dialogTreeApi.syncTree({ path: $scope.source.path, activate: false });
}
}
@@ -84,7 +84,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
$scope.busy = true;
$scope.error = false;
contentResource.move({ parentId: $scope.target.id, id: node.id })
contentResource.move({ parentId: $scope.target.id, id: $scope.source.id })
.then(function (path) {
$scope.error = false;
$scope.success = true;

6
src/Umbraco.Web.UI.Client/src/views/content/move.html
View File

@@ -11,14 +11,14 @@
<div ng-show="success">
<div class="alert alert-success">
<strong>{{currentNode.name}}</strong> was moved underneath&nbsp;<strong>{{target.name}}</strong>
<strong>{{source.name}}</strong> was moved underneath&nbsp;<strong>{{target.name}}</strong>
</div>
<button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
<button class="btn btn-primary" ng-click="close()">Ok</button>
</div>
<p class="abstract" ng-hide="success">
<localize key="actions_chooseWhereToMove">Choose where to move</localize>
<strong>{{currentNode.name}}</strong>
<strong>{{source.name}}</strong>
<localize key="actions_toInTheTreeStructureBelow">to in the tree structure below</localize>
</p>