From dc73660f604b67d1ee9e87c31e34801311cacbac Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 30 Jun 2004 22:25:35 +0000 Subject: [PATCH] git-svn-id: http://svn.opengroupware.org/SOGo/trunk@130 d1b88da0-ebda-0310-925b-ed51d893ca5b --- OGoContentStore/OCSFolder.m | 6 +++++- .../Appointments/SOGoAppointmentFolder.m | 18 ++++++++++++++++++ SOGo/UI/Scheduler/UIxAppointmentEditor.m | 7 +++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/OGoContentStore/OCSFolder.m b/OGoContentStore/OCSFolder.m index d8f5939c..402cd22e 100644 --- a/OGoContentStore/OCSFolder.m +++ b/OGoContentStore/OCSFolder.m @@ -196,11 +196,15 @@ static BOOL debugOn = YES; EOAdaptorChannel *storeChannel, *quickChannel; NSMutableDictionary *quickRow; OCSFieldExtractor *extractor; + + [self logWithFormat:@"SHOULD store content:\n%@", _content]; /* extract info */ extractor = [self->folderInfo quickExtractor]; quickRow = [extractor extractQuickFieldsFromContent:_content]; + + [self logWithFormat:@"SHOULD store quick: %@", quickRow]; /* open channels */ @@ -213,7 +217,7 @@ static BOOL debugOn = YES; [self releaseChannel:storeChannel]; return nil; } - + // TODO: gen SQL, execute in transactions [self releaseChannel:storeChannel]; diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m index 4c9eef0d..3013b40b 100644 --- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -178,4 +178,22 @@ printf( "%x", *(int *) &f); return records; } +/* GET */ + +- (id)GETAction:(WOContext *)_ctx { + // TODO: I guess this should really be done by SOPE (redirect to + // default method) + WOResponse *r; + NSString *uri; + + uri = [[_ctx request] uri]; + if (![uri hasSuffix:@"/"]) uri = [uri stringByAppendingString:@"/"]; + uri = [uri stringByAppendingString:@"weekoverview"]; + + r = [_ctx response]; + [r setStatus:302 /* moved */]; + [r setHeader:uri forKey:@"location"]; + return r; +} + @end /* SOGoAppointmentFolder */ diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m index 2870cd2a..db63474a 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m +++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m @@ -207,12 +207,15 @@ WOResponse *r; NSString *uri, *uriFormat, *objectId, *nextMethod; - /* clientObject *is* SOGoAppointmentFolder, so this should be an instance method? */ + /* + clientObject *is* SOGoAppointmentFolder, so this should be an instance + method? + */ objectId = [NSClassFromString(@"SOGoAppointmentFolder") globallyUniqueObjectId]; nextMethod = [NSString stringWithFormat:@"%@/edit", objectId]; - uriFormat = [self uriAsFormat]; + uriFormat = [self uriAsFormat]; uri = [NSString stringWithFormat:uriFormat, nextMethod]; req = [[self context] request]; -- 2.39.5