merge of '27e4a971509238d8a77bcdbd70c00f4fc4202a00'

and '310656e43745cf03a754d629917e6024ec566244'

Monotone-Parent: 27e4a971509238d8a77bcdbd70c00f4fc4202a00
Monotone-Parent: 310656e43745cf03a754d629917e6024ec566244
Monotone-Revision: a6eb90bb705891f429bad2f9b15a3fc4f18c040c

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-01T20:21:46
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle committed 2009-07-01 20:21:46 +00:00
commit 9506b6dade
9 files changed
+118 -7

No files matched your search

@@ -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];