(fix) also handle forwardAddress
This commit is contained in:
parent
dd13abd701
commit
ebf4c1a9c7
|
@ -27,9 +27,12 @@
|
||||||
|
|
||||||
data.SOGoMailLabelsColors = labels;
|
data.SOGoMailLabelsColors = labels;
|
||||||
|
|
||||||
// We convert our list of autoReplyEmailAddresses into a string.
|
// We convert our list of autoReplyEmailAddresses/forwardAddress into a string.
|
||||||
if (data.Vacation && data.Vacation.autoReplyEmailAddresses)
|
if (data.Vacation && data.Vacation.autoReplyEmailAddresses)
|
||||||
data.Vacation.autoReplyEmailAddresses = data.Vacation.autoReplyEmailAddresses.join(",");
|
data.Vacation.autoReplyEmailAddresses = data.Vacation.autoReplyEmailAddresses.join(",");
|
||||||
|
|
||||||
|
if (data.Forward && data.Forward.forwardAddress)
|
||||||
|
data.Forward.forwardAddress = data.Forward.forwardAddress.join(",");
|
||||||
|
|
||||||
angular.extend(_this.defaults, data);
|
angular.extend(_this.defaults, data);
|
||||||
});
|
});
|
||||||
|
@ -121,6 +124,9 @@
|
||||||
if (preferences.defaults.Vacation && preferences.defaults.Vacation.autoReplyEmailAddresses)
|
if (preferences.defaults.Vacation && preferences.defaults.Vacation.autoReplyEmailAddresses)
|
||||||
preferences.defaults.Vacation.autoReplyEmailAddresses = preferences.defaults.Vacation.autoReplyEmailAddresses.split(",");
|
preferences.defaults.Vacation.autoReplyEmailAddresses = preferences.defaults.Vacation.autoReplyEmailAddresses.split(",");
|
||||||
|
|
||||||
|
if (preferences.defaults.Forward && preferences.defaults.Forward.forwardAddress)
|
||||||
|
preferences.defaults.Forward.forwardAddress = preferences.defaults.Forward.forwardAddress.split(",");
|
||||||
|
|
||||||
if (preferences.settings.Calendar && preferences.settings.Calendar.PreventInvitationsWhitelist) {
|
if (preferences.settings.Calendar && preferences.settings.Calendar.PreventInvitationsWhitelist) {
|
||||||
var h = {};
|
var h = {};
|
||||||
_.each(preferences.settings.Calendar.PreventInvitationsWhitelist, function(user) {
|
_.each(preferences.settings.Calendar.PreventInvitationsWhitelist, function(user) {
|
||||||
|
|
Loading…
Reference in a new issue