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

Cleanup admin code

Browse source
This commit is contained in:
djmaze 2021-04-22 21:56:01 +02:00
parent 75c879836c
commit 3572d00a10
16 changed files with 178 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

40
dev/Settings/Admin/Contacts.js
View file

@ -105,8 +105,6 @@ export class ContactsAdminSettings {
})
})
this.onTestContactsResponse = this.onTestContactsResponse.bind(this);
decorateKoCommands(this, {
testContactsCommand: self => self.pdoDsn() && self.pdoUser()
});
@ -118,7 +116,24 @@ export class ContactsAdminSettings {
this.testContactsErrorMessage('');
this.testing(true);
Remote.testContacts(this.onTestContactsResponse, {
Remote.testContacts((iError, data) => {
this.testContactsSuccess(false);
this.testContactsError(false);
this.testContactsErrorMessage('');
if (!iError && data.Result.Result) {
this.testContactsSuccess(true);
} else {
this.testContactsError(true);
if (data && data.Result) {
this.testContactsErrorMessage(data.Result.Message || '');
} else {
this.testContactsErrorMessage('');
}
}
this.testing(false);
}, {
ContactsPdoType: this.contactsType(),
ContactsPdoDsn: this.pdoDsn(),
ContactsPdoUser: this.pdoUser(),
@ -126,25 +141,6 @@ export class ContactsAdminSettings {
});
}
onTestContactsResponse(iError, data) {
this.testContactsSuccess(false);
this.testContactsError(false);
this.testContactsErrorMessage('');
if (!iError && data.Result.Result) {
this.testContactsSuccess(true);
} else {
this.testContactsError(true);
if (data && data.Result) {
this.testContactsErrorMessage(data.Result.Message || '');
} else {
this.testContactsErrorMessage('');
}
}
this.testing(false);
}
onShow() {
this.testContactsSuccess(false);
this.testContactsError(false);