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

Ensures events for deleting, trashing and unpublishing are done using the event messages, updates UI to support showing these messages in the list view, Since we cannot change the

Browse Source 
method results on a service, we've created a new temporary service that we will explicitly implement with an extension method to get it. This is temporary until v8 where we will just replace
the original methods on the service with these methods and then remove this class.
This commit is contained in:
Shannon
2015-07-29 15:12:12 +02:00
parent 0e992f897f
commit 6d8ffb903f
27 changed files with 757 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
View File

@@ -91,6 +91,27 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
}
});
function showNotificationsAndReset(err, reload) {
//check if response is ysod
if(err.status && err.status >= 500) {
dialogService.ysodDialog(err);
}
$scope.bulkStatus = "";
$scope.actionInProgress = false;
if (reload === true) {
$scope.reloadView($scope.contentId);
}
if (err.data && angular.isArray(err.data.notifications)) {
for (var i = 0; i < err.data.notifications.length; i++) {
notificationsService.showNotification(err.data.notifications[i]);
}
}
}
$scope.isSortDirection = function (col, direction) {
return $scope.options.orderBy.toUpperCase() == col.toUpperCase() && $scope.options.orderDirection == direction;
}
@@ -276,12 +297,13 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
$scope.bulkStatus = "Deleted item " + current + " out of " + total + " item" + pluralSuffix;
deleteItemCallback(getIdCallback(selected[i])).then(function (data) {
if (current === total) {
//TODO: Should probably add notifications on the server side
notificationsService.success("Bulk action", "Deleted " + total + " item" + pluralSuffix);
$scope.bulkStatus = "";
$scope.reloadView($scope.contentId);
$scope.actionInProgress = false;
showNotificationsAndReset(data, true);
}
current++;
}, function (err) {
showNotificationsAndReset(err, false);
});
}
}
@@ -310,26 +332,12 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
.then(function(content) {
if (current == total) {
notificationsService.success("Bulk action", "Published " + total + " document" + pluralSuffix);
$scope.bulkStatus = "";
$scope.reloadView($scope.contentId);
$scope.actionInProgress = false;
showNotificationsAndReset(content, true);
}
current++;
}, function(err) {
$scope.bulkStatus = "";
$scope.reloadView($scope.contentId);
$scope.actionInProgress = false;
//if there are validation errors for publishing then we need to show them
if (err.status === 400 && err.data && err.data.Message) {
notificationsService.error("Publish error", err.data.Message);
}
else {
dialogService.ysodDialog(err);
}
showNotificationsAndReset(err, false);
});
}
};
@@ -356,12 +364,12 @@ function listViewController($rootScope, $scope, $routeParams, $injector, notific
if (current == total) {
notificationsService.success("Bulk action", "Unpublished " + total + " document" + pluralSuffix);
$scope.bulkStatus = "";
$scope.reloadView($scope.contentId);
$scope.actionInProgress = false;
showNotificationsAndReset(content, true);
}
current++;
}, function(err) {
showNotificationsAndReset(err, false);
});
}
};