amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-18 04:55:56 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail(js)): refresh of parent window when saving draft/template

Browse Source
This commit is contained in:
Francis Lachapelle
2022-05-17 15:31:59 -04:00
parent 35f9f35ef0
commit 715cf71ba3
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
UI/WebServerResources/js/Mailer/Mailer.app.js
View File

@@ -109,6 +109,11 @@
controllerAs: 'viewer'
}
},
params: {
reload: {
value: false
}
},
onEnter: onEnterMessage,
onExit: onExitMessage,
resolve: {
@@ -318,7 +323,7 @@
});
if (message && message.$reload) {
return message.$reload({useCache: true});
return message.$reload({useCache: !$stateParams.reload, nocache: $stateParams.reload});
}
else {
// Message not found

2
UI/WebServerResources/js/Mailer/MessageController.js
View File

@@ -101,6 +101,8 @@
// Cancel automatic mark as read
if (vm.message.$markAsReadPromise)
vm.service.$timeout.cancel(vm.message.$markAsReadPromise);
// Remove controller from window
delete $window.$messageController;
});
}; // $onInit

4
UI/WebServerResources/js/Mailer/MessageEditorController.js
View File

@@ -102,7 +102,7 @@
if ($window.opener) {
if ('$mailboxController' in $window.opener &&
'selectedFolder' in $window.opener.$mailboxController) {
if ($window.opener.$mailboxController.selectedFolder.type == 'draft') {
if ($window.opener.$mailboxController.selectedFolder.id == stateMessage.$mailbox.id) {
ctrls.draftMailboxCtrl = $window.opener.$mailboxController;
if ('$messageController' in $window.opener &&
$window.opener.$messageController.message.uid == stateMessage.uid) {
@@ -230,7 +230,7 @@
ctrls.draftMailboxCtrl.selectedFolder.$filter().then(function() {
if (ctrls.draftMessageCtrl) {
// Reload selected message
ctrls.draftMessageCtrl.$state.go('mail.account.mailbox.message', { messageId: vm.message.uid });
ctrls.draftMessageCtrl.$state.go('mail.account.mailbox.message', { messageId: vm.message.uid, reload: true });
}
});
}