amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-28 06:35:26 +00:00
Code Issues Projects Releases Wiki Activity

merge of 'c0da933d3e86c470a7d83491a010f1ba6edc3fcd'

Browse Source 
and 'da177815e95b11791d2a07d68ea27df0c5d8b8e8'

Monotone-Parent: c0da933d3e86c470a7d83491a010f1ba6edc3fcd
Monotone-Parent: da177815e95b11791d2a07d68ea27df0c5d8b8e8
Monotone-Revision: 61ccc0b85c5ad0f5c359e98c73da3a77ec12dd09

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-03-25T20:44:40
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-03-25 20:44:40 +00:00
parent a62cd61e0d 2bc2bb954b
commit 5f5942fbdb
4 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+12
View File
@@ -1,3 +1,15 @@
2008-03-25 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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
"davDisplayName" and if the current user has not the owner role
over the current collection.
2008-03-25 Francis Lachapelle <flachapelle@inverse.ca>
* UI/Scheduler/UIxCalMainView.m ([UIxCalMainView
SoObjects/SOGo/SOGoGCSFolder.m
+18 -4
View File
@@ -528,12 +528,26 @@ static BOOL sendFolderAdvisories = NO;
inContext: (WOContext *) localContext
{
NSString *newDisplayName;
NSException *exception;
NSArray *currentRoles;
newDisplayName = [setProps objectForKey: @"davDisplayName"];
if ([newDisplayName length])
[self renameTo: newDisplayName];
currentRoles = [[localContext activeUser] rolesForObject: self
inContext: localContext];
if ([currentRoles containsObject: SoRole_Owner])
{
newDisplayName = [setProps objectForKey: @"davDisplayName"];
if ([newDisplayName length])
{
[self renameTo: newDisplayName];
exception = nil;
}
else
exception = [NSException exceptionWithHTTPStatus: 404];
}
else
exception = [NSException exceptionWithHTTPStatus: 403];
return nil;
return exception;
}
/* acls as a container */
SoObjects/SOGo/SOGoObject.m
+2 -2
View File
@@ -20,8 +20,8 @@
*/
#if LIB_FOUNDATION_LIBRARY
#error SOGo will not work properly with libFoundation. \
Please use gnustep-base instead.
#error SOGo will not work properly with libFoundation.
#error Please use gnustep-base instead.
#endif
#import <unistd.h>
UI/Scheduler/UIxComponentEditor.m
+6 -10
View File
@@ -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]];
}