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

fixes tree sync with move media/content

Browse Source
This commit is contained in:
Shannon
2013-11-14 19:09:13 +11:00
parent 20f1a308a8
commit 4281610bc1
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,9 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
$scope.error = false;
$scope.success = true;
//first we need to remove the node that launched the dialog
treeService.removeNode($scope.currentNode);
//get the currently edited node (if any)
var activeNode = appState.getTreeState("selectedNode");

22
src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
View File

@@ -1,6 +1,6 @@
//used for the media picker dialog
angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
function ($scope, eventsService, mediaResource, $log) {
function ($scope, eventsService, mediaResource, appState, treeService, navigationService) {
var dialogOptions = $scope.$parent.dialogOptions;
$scope.dialogTreeEventHandler = $({});
@@ -28,9 +28,27 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
$scope.move = function(){
mediaResource.move({parentId: $scope.target.id, id: node.id})
.then(function(){
.then(function (path) {
$scope.error = false;
$scope.success = true;
//first we need to remove the node that launched the dialog
treeService.removeNode($scope.currentNode);
//get the currently edited node (if any)
var activeNode = appState.getTreeState("selectedNode");
//we need to do a double sync here: first sync to the moved content - but don't activate the node,
//then sync to the currenlty edited content (note: this might not be the content that was moved!!)
navigationService.syncTree({ tree: "media", path: path, forceReload: true, activate: false }).then(function (args) {
if (activeNode) {
var activeNodePath = treeService.getPath(activeNode).join();
//sync to this node now - depending on what was copied this might already be synced but might not be
navigationService.syncTree({ tree: "media", path: activeNodePath, forceReload: false, activate: true });
}
});
},function(err){
$scope.success = false;
$scope.error = err;