git-svn-id: http://svn.opengroupware.org/SOGo/trunk@130 d1b88da0-ebda-0310-925b-ed51d...

diff --git a/OGoContentStore/OCSFolder.m b/OGoContentStore/OCSFolder.m
index d8f5939ce1290cf502f561baf2fee001ce6a7e76..402cd22ec09536c1069762cfbcaca1b3996fe7c4 100644 (file)
--- 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 4c9eef0d7751559f5ac488e276eb46152ed069b4..3013b40be3c5780c8533ffb152a4c0477464fdaf 100644 (file)
--- 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 2870cd2a2cd4aa766f320bc3feffb4d2bc39f349..db63474adf64f36122cf3f959116a1535717c529 100644 (file)
--- 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];