From ebf4c1a9c7745030b47a4f2311e7a2d50544ef19 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 28 Apr 2015 13:56:50 -0400 Subject: [PATCH] (fix) also handle forwardAddress --- UI/WebServerResources/js/Preferences/preferences-model.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/UI/WebServerResources/js/Preferences/preferences-model.js b/UI/WebServerResources/js/Preferences/preferences-model.js index bfc8be34c..1392c26b8 100644 --- a/UI/WebServerResources/js/Preferences/preferences-model.js +++ b/UI/WebServerResources/js/Preferences/preferences-model.js @@ -27,9 +27,12 @@ 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) 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); }); @@ -121,6 +124,9 @@ if (preferences.defaults.Vacation && preferences.defaults.Vacation.autoReplyEmailAddresses) 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) { var h = {}; _.each(preferences.settings.Calendar.PreventInvitationsWhitelist, function(user) {