From: wolfgang Date: Fri, 1 Jun 2007 22:16:46 +0000 (+0000) Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1074 d1b88da0-ebda-0310... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=332022d13c28796c07b4a0d056cefc87795dbb69;p=scalable-opengroupware.org git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1074 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SoObjects/SOGo/SOGoObject.h b/SoObjects/SOGo/SOGoObject.h index 8370acf9..67142bfe 100644 --- a/SoObjects/SOGo/SOGoObject.h +++ b/SoObjects/SOGo/SOGoObject.h @@ -57,8 +57,8 @@ { WOContext *context; NSString *nameInContainer; - id container; NSString *owner; + id container; } + (id) objectWithName: (NSString *)_name inContainer:(id)_container; diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m index 1707caf3..46fffc69 100644 --- a/SoObjects/SOGo/SOGoObject.m +++ b/SoObjects/SOGo/SOGoObject.m @@ -77,7 +77,6 @@ { return [NSDictionary dictionaryWithObjectsAndKeys: @"read", SoPerm_AccessContentsInformation, - @"read", SoPerm_AccessContentsInformation, @"bind", SoPerm_AddDocumentsImagesAndFiles, @"unbind", SoPerm_DeleteObjects, @"write-acl", SoPerm_ChangePermissions, @@ -418,7 +417,9 @@ static BOOL kontactGroupDAV = YES; container = _container; if ([self doesRetainContainer]) [_container retain]; - ASSIGN (owner, [_container ownerInContext: context]); + owner = [self ownerInContext: context]; + if (owner) + [owner retain]; } return self; @@ -455,6 +456,9 @@ static BOOL kontactGroupDAV = YES; - (NSString *) ownerInContext: (id) localContext { + if (!owner) + owner = [container ownerInContext: context]; + return owner; } diff --git a/UI/MainUI/product.plist b/UI/MainUI/product.plist index dd5f0245..bad15487 100644 --- a/UI/MainUI/product.plist +++ b/UI/MainUI/product.plist @@ -72,6 +72,12 @@ SOGoRootPage = { }; SOGoUserFolder = { + methods = { + view = { + protectedBy = ""; + pageName = "SOGoUserHomePage"; + }; + }; }; SOGoGroupsFolder = { methods = {