jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

mail queue: fix refresh

Browse Source
This commit is contained in:
Girish Ramakrishnan
2022-09-23 14:12:05 +02:00
parent 9d349a038c
commit 1de19b1092
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/emails-queue.js
+23 -11
View File
@@ -18,6 +18,7 @@ angular.module('Application').controller('EmailsQueueController', ['$scope', '$l
$scope.queue = {
busy: true,
busyRefresh: false,
items: [],
activeItem: null,
currentPage: 1,
@@ -25,41 +26,52 @@ angular.module('Application').controller('EmailsQueueController', ['$scope', '$l
pageItems: $scope.pageItemCount[0],
search: '',
refresh: function () {
$scope.queue.busy = true;
refresh: function (showBusy, callback) {
if (showBusy) $scope.queue.busy = true;
Client.listMailQueue($scope.queue.search, $scope.queue.currentPage, $scope.queue.pageItems.value, function (error, result) {
if (error) return console.error('Failed to fetch mail eventlogs.', error);
if (showBusy) $scope.queue.busy = false;
$scope.queue.busy = false;
if (error) {
console.error('Failed to fetch mail eventlogs.', error);
} else {
$scope.queue.items = result;
}
$scope.queue.items = result;
if (callback) callback();
});
},
reload: function () {
$scope.queue.busyRefresh = true;
$scope.queue.refresh(true, function () {
$scope.queue.busyRefresh = false;
});
},
resend: function (item) {
Client.resendMailQueueItem(item.file, function (error) {
if (error) return console.error('Failed to retry item.', error);
$scope.queue.refresh();
$scope.queue.refresh(false);
});
},
discard: function (item) {
Client.delMailQueueItem(item.file, function (error) {
if (error) return console.error('Failed to discard item.', error);
$scope.queue.refresh();
$scope.queue.refresh(false);
});
},
showNextPage: function () {
$scope.queue.currentPage++;
$scope.queue.refresh();
$scope.queue.refresh(true);
},
showPrevPage: function () {
if ($scope.queue.currentPage > 1) $scope.queue.currentPage--;
else $scope.queue.currentPage = 1;
$scope.queue.refresh();
$scope.queue.refresh(true);
},
showItemDetails: function (item) {
@@ -69,14 +81,14 @@ angular.module('Application').controller('EmailsQueueController', ['$scope', '$l
updateFilter: function (fresh) {
if (fresh) $scope.queue.currentPage = 1;
$scope.queue.refresh();
$scope.queue.refresh(false);
}
};
Client.onReady(function () {
$scope.ready = true;
$scope.queue.refresh();
$scope.queue.refresh(true);
});
$('.modal-backdrop').remove();