Monotone-Parent: 7158469e2118ab9dc200e78b0beaa52690e57679

Monotone-Revision: a4dc112ad42d8b85263a723606a21cfe34e94865

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-01T22:16:20
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2007-06-01 22:16:20 +00:00
parent ca41e65c61
commit ff46d1cb29
4 changed files with 14 additions and 4 deletions

View File

@ -18,7 +18,7 @@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA. 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__ #ifndef __SOGo_SOGoContentObject_H__
#define __SOGo_SOGoContentObject_H__ #define __SOGo_SOGoContentObject_H__

View File

@ -57,8 +57,8 @@
{ {
WOContext *context; WOContext *context;
NSString *nameInContainer; NSString *nameInContainer;
id container;
NSString *owner; NSString *owner;
id container;
} }
+ (id) objectWithName: (NSString *)_name inContainer:(id)_container; + (id) objectWithName: (NSString *)_name inContainer:(id)_container;

View File

@ -77,7 +77,6 @@
{ {
return [NSDictionary dictionaryWithObjectsAndKeys: return [NSDictionary dictionaryWithObjectsAndKeys:
@"read", SoPerm_AccessContentsInformation, @"read", SoPerm_AccessContentsInformation,
@"read", SoPerm_AccessContentsInformation,
@"bind", SoPerm_AddDocumentsImagesAndFiles, @"bind", SoPerm_AddDocumentsImagesAndFiles,
@"unbind", SoPerm_DeleteObjects, @"unbind", SoPerm_DeleteObjects,
@"write-acl", SoPerm_ChangePermissions, @"write-acl", SoPerm_ChangePermissions,
@ -418,7 +417,9 @@ static BOOL kontactGroupDAV = YES;
container = _container; container = _container;
if ([self doesRetainContainer]) if ([self doesRetainContainer])
[_container retain]; [_container retain];
ASSIGN (owner, [_container ownerInContext: context]); owner = [self ownerInContext: context];
if (owner)
[owner retain];
} }
return self; return self;
@ -455,6 +456,9 @@ static BOOL kontactGroupDAV = YES;
- (NSString *) ownerInContext: (id) localContext - (NSString *) ownerInContext: (id) localContext
{ {
if (!owner)
owner = [container ownerInContext: context];
return owner; return owner;
} }

View File

@ -72,6 +72,12 @@
SOGoRootPage = { SOGoRootPage = {
}; };
SOGoUserFolder = { SOGoUserFolder = {
methods = {
view = {
protectedBy = "<public>";
pageName = "SOGoUserHomePage";
};
};
}; };
SOGoGroupsFolder = { SOGoGroupsFolder = {
methods = { methods = {