From ee3da047d31a0f724b485818ec61a210cc75785c Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 25 Aug 2004 22:29:44 +0000 Subject: [PATCH] fixes for Contacts git-svn-id: http://svn.opengroupware.org/SOGo/trunk@272 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/Main/SOGoUserHomePage.wox | 1 + SOGo/SoObjects/SOGo/ChangeLog | 4 ++++ SOGo/SoObjects/SOGo/SOGoUserFolder.m | 22 ++++++++++++++++++++++ SOGo/SoObjects/SOGo/Version | 2 +- SOGo/UI/Contacts/ChangeLog | 2 ++ SOGo/UI/Contacts/Version | 2 +- SOGo/UI/Contacts/product.plist | 6 +++++- 7 files changed, 36 insertions(+), 3 deletions(-) diff --git a/SOGo/Main/SOGoUserHomePage.wox b/SOGo/Main/SOGoUserHomePage.wox index 9585124a..3ed2dbdc 100644 --- a/SOGo/Main/SOGoUserHomePage.wox +++ b/SOGo/Main/SOGoUserHomePage.wox @@ -13,5 +13,6 @@ diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog index 7852a46d..0522beaa 100644 --- a/SOGo/SoObjects/SOGo/ChangeLog +++ b/SOGo/SoObjects/SOGo/ChangeLog @@ -1,3 +1,7 @@ +2004-08-26 Helge Hess + + * SOGoUserFolder.m: added ability to create Contacts folder (v0.9.13) + 2004-08-24 Maxime Wacker * GNUmakefile.preamble: fixes for the build process (v0.9.12) diff --git a/SOGo/SoObjects/SOGo/SOGoUserFolder.m b/SOGo/SoObjects/SOGo/SOGoUserFolder.m index 32955e94..314c4bc0 100644 --- a/SOGo/SoObjects/SOGo/SOGoUserFolder.m +++ b/SOGo/SoObjects/SOGo/SOGoUserFolder.m @@ -67,6 +67,9 @@ - (NSString *)ocsPrivateCalendarPath { return [[self ocsUserPath] stringByAppendingString:@"/Calendar"]; } +- (NSString *)ocsPrivateContactsPath { + return [[self ocsUserPath] stringByAppendingString:@"/Contacts"]; +} /* name lookup */ @@ -86,6 +89,22 @@ return [calendar autorelease]; } +- (id)privateContacts:(NSString *)_key inContext:(id)_ctx { + static Class calClass = Nil; + id calendar; + + if (calClass == Nil) + calClass = NSClassFromString(@"SOGoContactFolder"); + if (calClass == Nil) { + [self logWithFormat:@"ERROR: missing SOGoContactFolder class!"]; + return nil; + } + + calendar = [[calClass alloc] initWithName:_key inContainer:self]; + [calendar setOCSPath:[self ocsPrivateContactsPath]]; + return [calendar autorelease]; +} + - (id)groupsFolder:(NSString *)_key inContext:(id)_ctx { static Class fldClass = Nil; id folder; @@ -110,6 +129,9 @@ if ([_key isEqualToString:@"Calendar"]) return [self privateCalendar:_key inContext:_ctx]; + + if ([_key isEqualToString:@"Contacts"]) + return [self privateContacts:_key inContext:_ctx]; if ([_key isEqualToString:@"Groups"]) return [self groupsFolder:_key inContext:_ctx]; diff --git a/SOGo/SoObjects/SOGo/Version b/SOGo/SoObjects/SOGo/Version index 094d8771..0dca6b81 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:=12 +SUBMINOR_VERSION:=13 diff --git a/SOGo/UI/Contacts/ChangeLog b/SOGo/UI/Contacts/ChangeLog index b2e5d1ac..7c6d4522 100644 --- a/SOGo/UI/Contacts/ChangeLog +++ b/SOGo/UI/Contacts/ChangeLog @@ -1,5 +1,7 @@ 2004-08-26 Helge Hess + * product.plist: more fixes to product.plist (v0.9.2) + * product.plist: fixed package dependency, fixed category name (v0.9.1) 2004-08-25 Marcus Mueller diff --git a/SOGo/UI/Contacts/Version b/SOGo/UI/Contacts/Version index 237a5904..1bf86739 100644 --- a/SOGo/UI/Contacts/Version +++ b/SOGo/UI/Contacts/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=1 +SUBMINOR_VERSION:=2 diff --git a/SOGo/UI/Contacts/product.plist b/SOGo/UI/Contacts/product.plist index e5dfcb64..82465079 100644 --- a/SOGo/UI/Contacts/product.plist +++ b/SOGo/UI/Contacts/product.plist @@ -12,7 +12,11 @@ methods = { view = { protectedBy = "View"; - pageName = "UIxContactsListview"; + pageName = "UIxContactsListView"; + }; + GET = { /* hack to make it work as the default method */ + protectedBy = "View"; + pageName = "UIxContactsListView"; }; }; }; -- 2.39.5