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

Query aliases for each mailbox

Browse Source
This commit is contained in:
Girish Ramakrishnan
2020-04-20 19:09:25 -07:00
parent f91f08628a
commit fa08847d6d
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/email.js
View File

@@ -353,7 +353,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
return;
}
Client.setAliases($scope.domain.domain, $scope.mailboxes.edit.name, $scope.mailboxes.edit.aliases, function (error) {
Client.setAliases($scope.mailboxes.edit.name, $scope.domain.domain, $scope.mailboxes.edit.aliases, function (error) {
if (error) {
$scope.mailboxes.edit.error = error;
$scope.mailboxes.edit.busy = false;
@@ -408,16 +408,19 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
Client.getMailboxes($scope.domain.domain, function (error, mailboxes) {
if (error) return callback(error);
Client.listAliases($scope.domain.domain, function (error, aliases) {
if (error) return callback(error);
$scope.mailboxes.mailboxes = mailboxes;
$scope.mailboxes.mailboxes = mailboxes.map(function (m) {
m.aliases = aliases.filter(function (a) { return a.aliasName === m.name && a.aliasDomain === m.domain; }).map(function (a) { return { name: a.name, domain: a.domain }; });
asyncForEach(mailboxes, function (m, iteratorCallback) {
Client.getAliases(m.name, m.domain, function (error, aliases) {
if (error) return iteratorCallback(error);
m.aliases = aliases;
m.owner = $scope.users.find(function (u) { return u.id === m.ownerId; }); // owner may not exist
m.ownerDisplayName = m.owner ? m.owner.display : ''; // this meta property is set when we get the user list
return m;
iteratorCallback();
});
}, function iteratorDone(error) {
if (error) return callback(error);
Client.getMailUsage($scope.domain.domain, function (error, usage) {
if (error) return callback(error);