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

U4-8416 Empty recycle bin does not refresh or gives feedback to user

Browse Source
This commit is contained in:
Shannon
2016-06-27 18:27:49 +02:00
parent 374fa5b574
commit 0e61eb79a8
7 changed files with 83 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web.UI.Client/src/views/content/content.emptyrecyclebin.controller.js
View File

@@ -6,18 +6,33 @@
* @description
* The controller for deleting content
*/
function ContentEmptyRecycleBinController($scope, contentResource, treeService, navigationService) {
function ContentEmptyRecycleBinController($scope, contentResource, treeService, navigationService, notificationsService, $route) {
$scope.busy = false;
$scope.performDelete = function() {
//(used in the UI)
$scope.busy = true;
$scope.currentNode.loading = true;
contentResource.emptyRecycleBin($scope.currentNode.id).then(function () {
contentResource.emptyRecycleBin($scope.currentNode.id).then(function (result) {
$scope.busy = false;
$scope.currentNode.loading = false;
//TODO: Need to sync tree, etc...
//show any notifications
if (angular.isArray(result.notifications)) {
for (var i = 0; i < result.notifications.length; i++) {
notificationsService.showNotification(result.notifications[i]);
}
}
treeService.removeChildNodes($scope.currentNode);
navigationService.hideMenu();
//reload the current view
$route.reload();
});
};

17
src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html
View File

@@ -1,8 +1,17 @@
<div class="umb-dialog" ng-controller="Umbraco.Editors.Content.EmptyRecycleBinController">
<div class="umb-dialog-body" auto-scale="90">
<umb-confirm on-confirm="performDelete" on-cancel="cancel">
</umb-confirm>
<div class="umb-dialog-body">
<umb-pane>
<div class="umb-loader-wrapper" ng-show="busy">
<div class="umb-loader"></div>
</div>
<p class="umb-abstract">
<localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
<localize key="general_areyousure">Are you sure</localize>?
</p>
<umb-confirm on-confirm="performDelete" on-cancel="cancel">
</umb-confirm>
</umb-pane>
</div>
</div>

15
src/Umbraco.Web.UI.Client/src/views/media/emptyrecyclebin.html
View File

@@ -1,8 +1,19 @@
<div class="umb-dialog" ng-controller="Umbraco.Editors.Media.EmptyRecycleBinController">
<div class="umb-dialog-body">
<umb-confirm on-confirm="performDelete" on-cancel="cancel">
</umb-confirm>
<umb-pane>
<div class="umb-loader-wrapper" ng-show="busy">
<div class="umb-loader"></div>
</div>
<p class="umb-abstract">
<localize key="defaultdialogs_recycleBinWarning">When items are deleted from the recycle bin, they will be gone forever</localize>.
<localize key="general_areyousure">Are you sure</localize>?
</p>
<umb-confirm on-confirm="performDelete" on-cancel="cancel">
</umb-confirm>
</umb-pane>
</div>
</div>

21
src/Umbraco.Web.UI.Client/src/views/media/media.emptyrecyclebin.controller.js
View File

@@ -6,18 +6,33 @@
* @description
* The controller for deleting media
*/
function MediaEmptyRecycleBinController($scope, mediaResource, treeService, navigationService) {
function MediaEmptyRecycleBinController($scope, mediaResource, treeService, navigationService, notificationsService, $route) {
$scope.busy = false;
$scope.performDelete = function() {
//(used in the UI)
$scope.busy = true;
$scope.currentNode.loading = true;
mediaResource.emptyRecycleBin($scope.currentNode.id).then(function () {
mediaResource.emptyRecycleBin($scope.currentNode.id).then(function (result) {
$scope.busy = false;
$scope.currentNode.loading = false;
//TODO: Need to sync tree, etc...
//show any notifications
if (angular.isArray(result.notifications)) {
for (var i = 0; i < result.notifications.length; i++) {
notificationsService.showNotification(result.notifications[i]);
}
}
treeService.removeChildNodes($scope.currentNode);
navigationService.hideMenu();
//reload the current view
$route.reload();
});
};