From 2bc2bb954b1e7b2a0b0c257f26a6beff05f7e96a Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 25 Mar 2008 20:43:29 +0000 Subject: [PATCH] Monotone-Parent: f38b4d4216272f28a87c515f453e570087af0004 Monotone-Revision: da177815e95b11791d2a07d68ea27df0c5d8b8e8 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-03-25T20:43:29 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/Scheduler/UIxComponentEditor.m | 16 ++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 504865448..0991059fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-03-25 Wolfgang Sourdeau + * UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor + -takeValuesFromRequest:_rqinContext:_ctx]): treat the regular + monthly recurrences as all others. + * SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder -davSetProperties:setPropsremovePropertiesNamed:removedPropsinContext:localContext]): returns an exception if the property to modify is not diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m index 1521b06d9..91d40d0fb 100644 --- a/UI/Scheduler/UIxComponentEditor.m +++ b/UI/Scheduler/UIxComponentEditor.m @@ -1428,7 +1428,7 @@ RANGE(2); // We recur on specific days... if ([[self repeat2] intValue] == 1) { - [theRule setNamedValue: @"bymonthday" to: [self repeat5]]; + [theRule setNamedValue: @"bymonthday" to: [self repeat5]]; } else { @@ -1526,16 +1526,12 @@ RANGE(2); |iCalWeekDayFriday)]; [rule setFrequency: iCalRecurrenceFrequenceDaily]; } - else if ([repeat caseInsensitiveCompare: @"MONTHLY"] == NSOrderedSame) - { - [rule setNamedValue: @"bymonthday" - to: [NSString stringWithFormat: @"%d", [[component startDate] dayOfMonth]]]; - [rule setFrequency: iCalRecurrenceFrequenceMonthly]; - } - else if ([repeat caseInsensitiveCompare: @"DAILY"] == NSOrderedSame || - [repeat caseInsensitiveCompare: @"WEEKLY"] == NSOrderedSame || - [repeat caseInsensitiveCompare: @"YEARLY"] == NSOrderedSame) + else if ([repeat caseInsensitiveCompare: @"MONTHLY"] == NSOrderedSame + || [repeat caseInsensitiveCompare: @"DAILY"] == NSOrderedSame + || [repeat caseInsensitiveCompare: @"WEEKLY"] == NSOrderedSame + || [repeat caseInsensitiveCompare: @"YEARLY"] == NSOrderedSame) { + [rule setInterval: @"1"]; [rule setFrequency: (iCalRecurrenceFrequency) [rule valueForFrequency: repeat]]; }