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

diff --git a/SOGo/Main/SOGoUserHomePage.wox b/SOGo/Main/SOGoUserHomePage.wox
index 027fbae485b5a3fb5105a7c33e162dc78c855703..327ed4a5ccab21a10c88ddacf1675405c317f24a 100644 (file)
--- a/SOGo/Main/SOGoUserHomePage.wox
+++ b/SOGo/Main/SOGoUserHomePage.wox
@@ -12,7 +12,7 @@
     <h3>OpenGroupware.org: <var:string value="clientObject.login" /></h3>
 
     <ul>
-      <li><a href="Calendar/">Calendar</a></li>
+      <li><a href="Calendar/weekoverview">Calendar</a></li>
     </ul>
   </body>
 </html>

diff --git a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
index 13e6c633af803399ce12f56cec6e94cc41eae4c1..9182664a6b762dd4f8fda8331ece5e2e74f6e5ed 100644 (file)
--- a/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SOGo/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -29,4 +29,19 @@
   [super dealloc];
 }
 
+/* name lookup */
+
+- (id)lookupName:(NSString *)_key inContext:(id)_ctx acquire:(BOOL)_flag {
+  id obj;
+  
+  /* first check attributes directly bound to the application */
+  if ((obj = [super lookupName:_key inContext:_ctx acquire:NO]))
+    return obj;
+
+  [self logWithFormat:@"CHECK KEY: %@", _key];
+  
+  /* return 404 to stop acquisition */
+  return [NSException exceptionWithHTTPStatus:404 /* Not Found */];
+}
+
 @end /* SOGoAppointmentFolder */

diff --git a/SOGo/SoObjects/SOGo/SOGoContentObject.m b/SOGo/SoObjects/SOGo/SOGoContentObject.m
index 452d782a13cfeedd04a3f53ea4736364cd7b35ec..c29c43915f143a402373f180d752b8a02a91714d 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoContentObject.m
+++ b/SOGo/SoObjects/SOGo/SOGoContentObject.m
@@ -49,4 +49,12 @@
   return self->ocsPath;
 }
 
+/* description */
+
+- (void)appendAttributesToDescription:(NSMutableString *)_ms {
+  [super appendAttributesToDescription:_ms];
+  
+  [_ms appendFormat:@" ocs=%@", [self ocsPath]];
+}
+
 @end /* SOGoContentObject */

diff --git a/SOGo/SoObjects/SOGo/SOGoFolder.m b/SOGo/SoObjects/SOGo/SOGoFolder.m
index 28f8b1c6d08ba675d5a2443f47d81b9b48dc1293..a0ef5b14b829edac4d7dba462c752dae12dd91da 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoFolder.m
@@ -49,4 +49,12 @@
   return self->ocsPath;
 }
 
+/* description */
+
+- (void)appendAttributesToDescription:(NSMutableString *)_ms {
+  [super appendAttributesToDescription:_ms];
+  
+  [_ms appendFormat:@" ocs=%@", [self ocsPath]];
+}
+
 @end /* SOGoFolder */

diff --git a/SOGo/SoObjects/SOGo/SOGoObject.h b/SOGo/SoObjects/SOGo/SOGoObject.h
index 02502a587ee1bec2b31d0059203a084afaec73e4..fb90b6eb4300aebd872b025ec01d4316fd5b4c65 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoObject.h
+++ b/SOGo/SoObjects/SOGo/SOGoObject.h
@@ -25,6 +25,7 @@
 
 #import <Foundation/NSObject.h>
 
+@class NSString, NSMutableString;
 @class OCSFolderManager, OCSFolder;
 @class SOGoUserFolder;
 
@@ -45,6 +46,10 @@
 
 - (SOGoUserFolder *)lookupUserFolder;
 
+/* description */
+
+- (void)appendAttributesToDescription:(NSMutableString *)_ms;
+
 @end
 
 #endif /* __SoObjects_SOGoObject_H__ */

diff --git a/SOGo/SoObjects/SOGo/SOGoObject.m b/SOGo/SoObjects/SOGo/SOGoObject.m
index dbde44b32b4eb7730196b3484afd48503475942d..1bab70edd2ff18046bf5f2f1cde78d49c3bc512d 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoObject.m
+++ b/SOGo/SoObjects/SOGo/SOGoObject.m
@@ -72,4 +72,23 @@
   return nil;
 }
 
+/* description */
+
+- (void)appendAttributesToDescription:(NSMutableString *)_ms {
+  if (self->nameInContainer) 
+    [_ms appendFormat:@" name=%@", self->nameInContainer];
+  if (self->container) 
+    [_ms appendFormat:@" container=0x%08X", self->container];
+}
+
+- (NSString *)description {
+  NSMutableString *ms;
+
+  ms = [NSMutableString stringWithCapacity:64];
+  [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+  [self appendAttributesToDescription:ms];
+  [ms appendString:@">"];
+  return ms;
+}
+
 @end /* SOGoObject */

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index fff230bd18254f537950141028a1187584c6d7ae..d74d813121fa875883827bc26d53904dcaed4355 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,7 +1,7 @@
 2004-06-30  Helge Hess  <helge.hess@opengroupware.org>
 
-       * UIxCalView.h, UIxAppointmentView.h, UIxAppointmentEditor.m: include 
-         UIxComponent from SOGoUI
+       * UIxCalView.h, UIxAppointmentView.h, UIxAppointmentEditor.m,
+         UIxCalSelectTab.m: include UIxComponent from SOGoUI
 
        * removed backend stuff from some sources
 

diff --git a/SOGo/UI/Scheduler/product.plist b/SOGo/UI/Scheduler/product.plist
index f00e9f8d2169e4aea1401f8b10cdfe0bf3018b5c..a04edd38190e689d40c722273be264722e621e98 100644 (file)
--- a/SOGo/UI/Scheduler/product.plist
+++ b/SOGo/UI/Scheduler/product.plist
@@ -1,5 +1,5 @@
 {
-  requires = ( MAIN, CommonUI );
+  requires = ( MAIN, CommonUI, Appointments );
 
   publicResources = (
     previous_week.gif,

diff --git a/dbd/README b/dbd/README
index 71e194530720f621d15e051f1b239e4e20998833..6405c13904787afb7e73029c53b35e0d1c8608f0 100644 (file)
--- a/dbd/README
+++ b/dbd/README
@@ -104,3 +104,5 @@ Tricks used
     a proper value, see above
     - if the baseURL doesn't match the requested WebDAV URL, we run into
       problems, maybe need to fix something in the SOPE WebDAV layer here
+
+- a trick to stop acquisition is to return a NSException 404 code.