Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 20:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved additional account management

Browse source
This commit is contained in:
djmaze 2021-11-15 10:56:52 +01:00
parent b057c4083e
commit 6b8020b8f5
15 changed files with 161 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

20
dev/App/User.js
View file

@ -420,10 +420,10 @@ class AppUser extends AbstractApp {
if (!iError) {
const counts = {},
sAccountEmail = AccountUserStore.email();
let parentEmail = SettingsGet('ParentEmail') || sAccountEmail;
accounts = oData.Result.Accounts,
mainEmail = SettingsGet('MainEmail');
if (isArray(oData.Result.Accounts)) {
if (isArray(accounts)) {
AccountUserStore.accounts.forEach(oAccount =>
counts[oAccount.email] = oAccount.count()
);
@ -431,10 +431,12 @@ class AppUser extends AbstractApp {
delegateRunOnDestroy(AccountUserStore.accounts());
AccountUserStore.accounts(
oData.Result.Accounts.map(
sValue => new AccountModel(sValue, sValue !== parentEmail, counts[sValue] || 0)
accounts.map(
sValue => new AccountModel(sValue, counts[sValue])
)
);
// accounts.length &&
AccountUserStore.accounts.unshift(new AccountModel(mainEmail, counts[mainEmail], false));
}
if (isArray(oData.Result.Identities)) {
@ -442,9 +444,10 @@ class AppUser extends AbstractApp {
IdentityUserStore(
oData.Result.Identities.map(identityData => {
const id = pString(identityData.Id),
email = pString(identityData.Email),
identity = new IdentityModel(id, email);
const identity = new IdentityModel(
pString(identityData.Id),
pString(identityData.Email)
);
identity.name(pString(identityData.Name));
identity.replyTo(pString(identityData.ReplyTo));
@ -715,7 +718,6 @@ class AppUser extends AbstractApp {
NotificationUserStore.enableDesktopNotification(!!SettingsGet('DesktopNotifications'));
AccountUserStore.email(SettingsGet('Email'));
AccountUserStore.parentEmail(SettingsGet('ParentEmail'));
this.foldersReload(value => {
try {