Monotone-Parent: ceeb01446ec3ddc689505cb7bb9f3110f23ad06d

Monotone-Revision: 4540bdac2b25e94022f859ccd01e9fd4f28ef349

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-01T19:27:44
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-07-01 19:27:44 +00:00
parent 79d23608d4
commit 5a3163c1f1
2 changed files with 12 additions and 2 deletions
+6
View File
@@ -1,3 +1,9 @@
2009-07-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(-lookupName:inContext:acquire:): handle "AsTask" and
"AsAppointment" url suffix only for the default "so" handler.
2009-07-01 Cyril Robert <crobert@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m: Remove color from user settings on
@@ -64,6 +64,7 @@
#import <SOGo/SOGoUserFolder.h>
#import <SOGo/SOGoWebDAVAclManager.h>
#import <SOGo/SOGoWebDAVValue.h>
#import <SOGo/WORequest+SOGo.h>
#import "iCalEntityObject+SOGo.h"
#import "SOGoAppointmentObject.h"
@@ -1937,6 +1938,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
id obj;
NSString *url;
BOOL handledLater;
WORequest *rq;
/* first check attributes directly bound to the application */
handledLater = [self requestNamedIsHandledLater: _key];
@@ -1947,9 +1949,11 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
obj = [super lookupName:_key inContext:_ctx acquire:NO];
if (!obj)
{
if ([self isValidContentName:_key])
rq = [_ctx request];
if ([self isValidContentName:_key]
&& [rq handledByDefaultHandler])
{
url = [[[_ctx request] uri] urlWithoutParameters];
url = [[rq uri] urlWithoutParameters];
if ([url hasSuffix: @"AsTask"])
obj = [SOGoTaskObject objectWithName: _key
inContainer: self];