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

mailboxName should have lower priority than location change

Browse Source
This commit is contained in:
Girish Ramakrishnan
2020-03-19 16:48:46 -07:00
parent 14348eba38
commit b307d278b0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/activity.js
View File

@@ -169,12 +169,6 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
} else {
return name + ' was taken out of repair mode';
}
} else if (('mailboxName' in data) && data.mailboxName !== data.app.mailboxName) {
if (data.mailboxName) {
return 'Mailbox of ' + name + ' was set to ' + q(data.mailboxName);
} else {
return 'Mailbox of ' + name + ' was reset';
}
} else if ('enableBackup' in data) {
return 'Automatic backups of ' + name + ' was ' + (data.enableBackup ? 'enabled' : 'disabled');
} else if ('enableAutomaticUpdate' in data) {
@@ -208,6 +202,12 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
} else {
return 'Icon of ' + name + ' was reset';
}
} else if (('mailboxName' in data) && data.mailboxName !== data.app.mailboxName) {
if (data.mailboxName) {
return 'Mailbox of ' + name + ' was set to ' + q(data.mailboxName);
} else {
return 'Mailbox of ' + name + ' was reset';
}
}
return data.app.manifest.title + ' was re-configured at ' + (data.app.fqdn || data.app.location);