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

Fixup the mailbox edit logic

Browse Source
This commit is contained in:
Johannes Zellner
2018-04-05 21:15:02 +02:00
parent a0dbcc9bb3
commit 01bfd84853
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard/src/views/email.html
+2 -2
View File
@@ -131,12 +131,12 @@
<td class="text-left elide-table-cell">
<select ng-model="mailbox.owner" ng-options="u.display for u in users track by u.id"></select>
</td>
<td>
<td class="elide-table-cell no-wrap">
<p ng-show="mailbox.aliases !== mailbox.orig.aliases && mailbox.error" class="text-danger"><b>{{ mailbox.error }}</b></p>
<tag-input placeholder="add alias" taglist="mailbox.aliases" name="aliases"></tag-input>
</td>
<td class="text-right no-wrap">
<button ng-show="mailbox.owner !== mailbox.orig.owner || mailbox.aliases !== mailbox.orig.aliases" class="btn btn-xs btn-primary" ng-disabled="mailbox.busy" ng-click="mailboxes.submit(mailbox)"><i class="fa fa-circle-o-notch fa-spin" ng-show="mailbox.busy"></i> Save</button>
<button ng-show="mailbox.owner !== mailbox.orig.owner || mailbox.aliases !== mailbox.orig.aliases" class="btn btn-xs btn-success" ng-disabled="mailbox.busy" ng-click="mailboxes.submit(mailbox)"><i class="fa" ng-class="{ 'fa-spin': mailbox.busy, 'fa-circle-o-notch': mailbox.busy, 'fa-check': !mailbox.busy }"></i></button>
<button class="btn btn-xs btn-danger" ng-disabled="mailbox.busy" ng-click="mailboxes.remove(mailbox)"><i class="fa" ng-class="{ 'fa-spin': mailbox.busy, 'fa-circle-o-notch': mailbox.busy, 'fa-trash': !mailbox.busy }"></i></button>
</td>
</tr>
dashboard/src/views/email.js
+12 -14
View File
@@ -158,7 +158,7 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
if (error) return console.error(error);
$scope.mailboxes.mailboxes = mailboxes.map(function (m) {
m.aliases = aliases.filter(function (a) { return a.ownerId === m.id; }).map(function (a) { return a.name; }).join(',');
m.aliases = aliases.filter(function (a) { return a.aliasTarget === m.name; }).map(function (a) { return a.name; }).join(',');
m.owner = $scope.users.find(function (u) { return u.id === m.ownerId; });
m.orig = {};
@@ -171,21 +171,21 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
});
},
submit: function (user) {
user.busy = true;
user.error ='';
submit: function (mailbox) {
mailbox.busy = true;
mailbox.error ='';
var aliases = user.aliases.split(',').map(function (a) { return a.trim(); }).filter(function (a) { return !!a; });
var aliases = mailbox.aliases.split(',').map(function (a) { return a.trim(); }).filter(function (a) { return !!a; });
function done(error) {
user.busy = false;
mailbox.busy = false;
if (error && error.statusCode === 409) {
var alias = error.message.match(RegExp('\'(.*)-' + $scope.selectedDomain.domain + '\''))[1];
user.error = alias + '@' + $scope.selectedDomain.domain + ' already exists';
mailbox.error = alias + '@' + $scope.selectedDomain.domain + ' already exists';
return;
} else if (error && error.statusCode === 400) {
user.error = error.message;
mailbox.error = error.message;
return;
} else if (error) {
console.error('Unable to configure mailbox.', error);
@@ -193,16 +193,14 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
}
// reset the dirty state
user.orig.mailboxEnabled = user.mailboxEnabled;
user.orig.aliases = user.aliases;
mailbox.orig.aliases = mailbox.aliases;
mailbox.orig.owner = mailbox.owner;
}
var func = user.mailboxEnabled ? Client.enableUserMailbox : Client.disableUserMailbox;
func($scope.selectedDomain.domain, user.id, function (error) {
Client.updateMailbox($scope.selectedDomain.domain, mailbox.name, mailbox.owner.id, function (error) {
if (error) return done(error);
if (user.mailboxEnabled) Client.setAliases($scope.selectedDomain.domain, user.id, aliases, done);
else done();
Client.setAliases($scope.selectedDomain.domain, mailbox.name, aliases, done);
});
}
};