diff --git a/SoObjects/SOGo/SOGoContentObject.h b/SoObjects/SOGo/SOGoContentObject.h index e1a723b97..52064b432 100644 --- a/SoObjects/SOGo/SOGoContentObject.h +++ b/SoObjects/SOGo/SOGoContentObject.h @@ -18,7 +18,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id: SOGoContentObject.h 1050 2007-04-27 22:15:40Z wolfgang $ +// $Id: SOGoContentObject.h 1073 2007-06-01 21:05:56Z wolfgang $ #ifndef __SOGo_SOGoContentObject_H__ #define __SOGo_SOGoContentObject_H__ diff --git a/SoObjects/SOGo/SOGoObject.h b/SoObjects/SOGo/SOGoObject.h index 8370acf9c..67142bfef 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 1707caf35..46fffc697 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 dd5f0245b..bad15487b 100644 --- a/UI/MainUI/product.plist +++ b/UI/MainUI/product.plist @@ -72,6 +72,12 @@ SOGoRootPage = { }; SOGoUserFolder = { + methods = { + view = { + protectedBy = ""; + pageName = "SOGoUserHomePage"; + }; + }; }; SOGoGroupsFolder = { methods = {