amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-09 18:35:10 +00:00
Code Issues Projects Releases Wiki Activity

fix(preferences(js)): set account id before importing certificate

Browse Source 
Fixes #5084
This commit is contained in:
Francis Lachapelle
2020-07-16 17:30:10 -04:00
parent b78e66a10b
commit 566fe55d71
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Preferences/AccountDialogController.js
+1 -1
View File
@@ -49,7 +49,7 @@
onSuccessItem: function(item, response, status, headers) {
this.clearQueue();
$timeout(function() {
_.assign(vm.account, {security: {hasCertificate: true}});
_.assign(vm.account, {security: {hasCertificate: true}, $$certificate: response});
});
_loadCertificate();
},
UI/WebServerResources/js/Preferences/PreferencesController.js
+6 -3
View File
@@ -105,7 +105,9 @@
this.addMailAccount = function(ev, form) {
var account, index;
index = this.preferences.defaults.AuxiliaryMailAccounts.length;
account = new Account({
id: index,
isNew: true,
name: "",
identities: [
@@ -121,7 +123,6 @@
receiptAnyAction: "ignore"
}
});
index = this.preferences.defaults.AuxiliaryMailAccounts.length;
$mdDialog.show({
controller: 'AccountDialogController',
@@ -147,8 +148,10 @@
};
this.editMailAccount = function(event, index, form) {
var data = _.cloneDeep(this.preferences.defaults.AuxiliaryMailAccounts[index]);
var account = new Account(data);
var data, account;
data = _.assign({ id: index }, _.cloneDeep(this.preferences.defaults.AuxiliaryMailAccounts[index]));
account = new Account(data);
$mdDialog.show({
controller: 'AccountDialogController',
controllerAs: '$AccountDialogController',