amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-10 04:49:46 +00:00
Code Issues Projects Releases Wiki Activity

merge of '025dc837dc0929ee47957b2385959532807a1b9c'

Browse Source 
and 'a6eb90bb705891f429bad2f9b15a3fc4f18c040c'

Monotone-Parent: 025dc837dc0929ee47957b2385959532807a1b9c
Monotone-Parent: a6eb90bb705891f429bad2f9b15a3fc4f18c040c
Monotone-Revision: 1c444d4c347ea6897dc7ebdf7e4f2149271c5203

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-01T20:22:39
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-07-01 20:22:39 +00:00
parent b57eb03a29 9506b6dade
commit cdffc1736e
9 changed files with 118 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAppointmentFolder.m
+6 -2
View File
@@ -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];