parent
2730a91b54
commit
7494bb3ae6
|
@ -1094,7 +1094,7 @@ static NSString *sieveScriptName = @"sogo";
|
||||||
|
|
||||||
addresses = [values objectForKey: @"forwardAddress"];
|
addresses = [values objectForKey: @"forwardAddress"];
|
||||||
if ([addresses isKindOfClass: [NSString class]])
|
if ([addresses isKindOfClass: [NSString class]])
|
||||||
addresses = [NSArray arrayWithObject: addresses];
|
addresses = [addresses componentsSeparatedByString: @","];
|
||||||
|
|
||||||
for (i = 0; i < [addresses count]; i++)
|
for (i = 0; i < [addresses count]; i++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -65,8 +65,7 @@
|
||||||
mailAccount.port = null;
|
mailAccount.port = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
// We convert our list of autoReplyEmailAddresses/forwardAddress into a string.
|
// We convert our date objects into real date, otherwise we'll have strings
|
||||||
// We also convert our date objects into real date, otherwise we'll have strings
|
|
||||||
// or undefined values and the md-datepicker does NOT like this.
|
// or undefined values and the md-datepicker does NOT like this.
|
||||||
if (data.Vacation) {
|
if (data.Vacation) {
|
||||||
if (data.Vacation.startDate)
|
if (data.Vacation.startDate)
|
||||||
|
@ -109,8 +108,12 @@
|
||||||
data.Vacation.endDate = new Date();
|
data.Vacation.endDate = new Date();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.Forward && angular.isUndefined(data.Forward.forwardAddress))
|
if (data.Forward) {
|
||||||
|
if (angular.isString(data.Forward.forwardAddress))
|
||||||
|
data.Forward.forwardAddress = data.Forward.forwardAddress.split(/, */);
|
||||||
|
else if (!angular.isArray(data.Forward.forwardAddress))
|
||||||
data.Forward.forwardAddress = [];
|
data.Forward.forwardAddress = [];
|
||||||
|
}
|
||||||
|
|
||||||
// Split calendar categories colors keys and values
|
// Split calendar categories colors keys and values
|
||||||
if (angular.isUndefined(data.SOGoCalendarCategories))
|
if (angular.isUndefined(data.SOGoCalendarCategories))
|
||||||
|
|
Loading…
Reference in New Issue