From 075311501c530ac2f33328038b20ff397ff1c3a8 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 20 Sep 2004 10:51:12 +0000 Subject: [PATCH] various minor fixes & enhancements git-svn-id: http://svn.opengroupware.org/SOGo/trunk@308 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/Main/ChangeLog | 4 +++ SOGo/Main/SOGoUserHomePage.wox | 3 +- SOGo/Main/Version | 2 +- SOGo/SoObjects/SOGo/ChangeLog | 6 +++- SOGo/SoObjects/SOGo/SOGoObject.m | 8 +++-- SOGo/SoObjects/SOGo/Version | 2 +- SOGo/UI/Common/ChangeLog | 4 +++ SOGo/UI/Common/UIxPageFrame.wox | 50 +++++++++++++++++++++++++++----- SOGo/UI/Common/Version | 2 +- SOGo/UI/Mailer/UIxMailView.m | 7 ++--- SOGo/UI/Mailer/UIxMailView.wox | 2 +- 11 files changed, 69 insertions(+), 21 deletions(-) diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog index 588d4a3c..5e9171f9 100644 --- a/SOGo/Main/ChangeLog +++ b/SOGo/Main/ChangeLog @@ -1,3 +1,7 @@ +2004-09-20 Helge Hess + + * SOGoUserHomePage.wox: added link to Mail (v0.9.10) + 2004-08-27 Marcus Mueller * v0.9.9 diff --git a/SOGo/Main/SOGoUserHomePage.wox b/SOGo/Main/SOGoUserHomePage.wox index c1697f92..c657ec2b 100644 --- a/SOGo/Main/SOGoUserHomePage.wox +++ b/SOGo/Main/SOGoUserHomePage.wox @@ -13,7 +13,8 @@
    -
    • +
    • +
diff --git a/SOGo/Main/Version b/SOGo/Main/Version index 81be7eb6..317960a7 100644 --- a/SOGo/Main/Version +++ b/SOGo/Main/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=9 +SUBMINOR_VERSION:=10 diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog index 607664da..6cc26756 100644 --- a/SOGo/SoObjects/SOGo/ChangeLog +++ b/SOGo/SoObjects/SOGo/ChangeLog @@ -1,4 +1,8 @@ -2004-09-08 +2004-09-20 Helge Hess + + * SOGoObject.m(-description): added name of container (v0.9.17) + +2004-09-08 Helge Hess * SOGoGroupFolder.m: separate -resetFolderCaches method from -sleep (v0.9.16) diff --git a/SOGo/SoObjects/SOGo/SOGoObject.m b/SOGo/SoObjects/SOGo/SOGoObject.m index fc8fa491..03087268 100644 --- a/SOGo/SoObjects/SOGo/SOGoObject.m +++ b/SOGo/SoObjects/SOGo/SOGoObject.m @@ -108,10 +108,12 @@ /* description */ - (void)appendAttributesToDescription:(NSMutableString *)_ms { - if (self->nameInContainer) + if (self->nameInContainer != nil) [_ms appendFormat:@" name=%@", self->nameInContainer]; - if (self->container) - [_ms appendFormat:@" container=0x%08X", self->container]; + if (self->container != nil) { + [_ms appendFormat:@" container=0x%08X/%@", + self->container, [self->container valueForKey:@"nameInContainer"]]; + } } - (NSString *)description { diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version index 255d8fd4..15ba30f9 100644 --- a/SOGo/SoObjects/SOGo/Version +++ b/SOGo/SoObjects/SOGo/Version @@ -1,3 +1,3 @@ # $Id: Version 170 2004-08-11 10:45:40Z helge $ -SUBMINOR_VERSION:=16 +SUBMINOR_VERSION:=17 diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog index 724fc3a6..4b4aeb2d 100644 --- a/SOGo/UI/Common/ChangeLog +++ b/SOGo/UI/Common/ChangeLog @@ -1,3 +1,7 @@ +2004-09-20 Helge Hess + + * UIxPageFrame.wox: improved debugging section (v0.9.25) + 2004-09-10 Marcus Mueller * uix.css: new button_submit style for the Anais selector, looks diff --git a/SOGo/UI/Common/UIxPageFrame.wox b/SOGo/UI/Common/UIxPageFrame.wox index f868ee0a..b04ed19d 100644 --- a/SOGo/UI/Common/UIxPageFrame.wox +++ b/SOGo/UI/Common/UIxPageFrame.wox @@ -41,6 +41,7 @@ + @@ -93,18 +94,53 @@
- -
- clientObject: -

- OTS: -

- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
clientObject:
traversal stack: + +
+ +
traversal path: + + + +
request type: +
path info:
rootURL:
active user:
+
diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version index a281cca1..8b283eb3 100644 --- a/SOGo/UI/Common/Version +++ b/SOGo/UI/Common/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=24 +SUBMINOR_VERSION:=25 diff --git a/SOGo/UI/Mailer/UIxMailView.m b/SOGo/UI/Mailer/UIxMailView.m index 209df7c2..95c28d14 100644 --- a/SOGo/UI/Mailer/UIxMailView.m +++ b/SOGo/UI/Mailer/UIxMailView.m @@ -20,12 +20,10 @@ */ // $Id$ - #include @interface UIxMailView : UIxComponent { - } - (BOOL)isDeletableClientObject; @@ -45,8 +43,7 @@ id url; if (![self isDeletableClientObject]) { - /* return 400 == Bad Request */ - return [NSException exceptionWithHTTPStatus:400 + return [NSException exceptionWithHTTPStatus:400 /* Bad Request */ reason:@"method cannot be invoked on " @"the specified object"]; } @@ -61,4 +58,4 @@ return [self redirectToLocation:url]; } -@end +@end /* UIxMailView */ diff --git a/SOGo/UI/Mailer/UIxMailView.wox b/SOGo/UI/Mailer/UIxMailView.wox index 7f53e297..00d401b4 100644 --- a/SOGo/UI/Mailer/UIxMailView.wox +++ b/SOGo/UI/Mailer/UIxMailView.wox @@ -11,4 +11,4 @@
clientObject: - \ No newline at end of file + -- 2.39.5