LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(js) Notify on successful messages operations

pull/216/merge
Francis Lachapelle 2016-07-15 14:37:56 -04:00
parent f9cebd975a
commit 1a3fc0a1d2
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -4,6 +4,7 @@
Enhancements
- [web] improve action progress when login in or sending a message (#3765, #3761)
- [web] don't allow to send the message while an upload is in progress
- [web] notify when successfuly copied or moved some messages
3.1.4 (2016-07-12)
------------------

6
UI/MailerUI/English.lproj/Localizable.strings
View File

@ -271,6 +271,12 @@
/* Confirmation message when deleting multiple messages */
"Are you sure you want to delete the selected messages?" = "Are you sure you want to delete the selected messages?";
/* Notification on the number of messages successfuly copied */
"%{0} message(s) copied" = "%{0} message(s) copied";
/* Notification on the number of messages successfuly movied */
"%{0} message(s) copied" = "%{0} message(s) moved";
"Please select a message." = "Please select a message.";
"Please select a message to print." = "Please select a message to print.";
"Please select only one message to print." = "Please select only one message to print.";

18
UI/WebServerResources/js/Mailer/MailboxController.js
View File

@ -6,8 +6,8 @@
/**
* @ngInject
*/
MailboxController.$inject = ['$window', '$timeout', '$q', '$state', '$mdDialog', 'stateAccounts', 'stateAccount', 'stateMailbox', 'encodeUriFilter', 'sgFocus', 'Dialog', 'Account', 'Mailbox'];
function MailboxController($window, $timeout, $q, $state, $mdDialog, stateAccounts, stateAccount, stateMailbox, encodeUriFilter, focus, Dialog, Account, Mailbox) {
MailboxController.$inject = ['$window', '$timeout', '$q', '$state', '$mdDialog', '$mdToast', 'stateAccounts', 'stateAccount', 'stateMailbox', 'encodeUriFilter', 'sgFocus', 'Dialog', 'Account', 'Mailbox'];
function MailboxController($window, $timeout, $q, $state, $mdDialog, $mdToast, stateAccounts, stateAccount, stateMailbox, encodeUriFilter, focus, Dialog, Account, Mailbox) {
var vm = this, messageDialog = null;
// Expose controller
@ -200,14 +200,26 @@
function copySelectedMessages(dstFolder) {
var selectedMessages = vm.selectedFolder.$selectedMessages();
if (_.size(selectedMessages) > 0)
vm.selectedFolder.$copyMessages(selectedMessages, '/' + dstFolder);
vm.selectedFolder.$copyMessages(selectedMessages, '/' + dstFolder).then(function() {
$mdToast.show(
$mdToast.simple()
.content(l('%{0} message(s) copied', vm.selectedFolder.$selectedCount()))
.position('top right')
.hideDelay(2000));
});
}
function moveSelectedMessages(dstFolder) {
var moveSelectedMessage = vm.selectedFolder.hasSelectedMessage();
var selectedMessages = vm.selectedFolder.$selectedMessages();
var count = vm.selectedFolder.$selectedCount();
if (_.size(selectedMessages) > 0)
vm.selectedFolder.$moveMessages(selectedMessages, '/' + dstFolder).then(function(index) {
$mdToast.show(
$mdToast.simple()
.content(l('%{0} message(s) moved', count))
.position('top right')
.hideDelay(2000));
if (Mailbox.$virtualMode) {
// When performing an advanced search, we refresh the view if the selected message
// was moved, but only once all promises have completed.