]> err.no Git - scalable-opengroupware.org/commitdiff
git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1074 d1b88da0-ebda-0310...
authorwolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Fri, 1 Jun 2007 22:16:46 +0000 (22:16 +0000)
committerwolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Fri, 1 Jun 2007 22:16:46 +0000 (22:16 +0000)
SoObjects/SOGo/SOGoObject.h
SoObjects/SOGo/SOGoObject.m
UI/MainUI/product.plist

index 8370acf9c08cfb97bb2312569cd045ed82cf22f3..67142bfef0c42918aed124628dda24ba1b547ba4 100644 (file)
@@ -57,8 +57,8 @@
 {
   WOContext *context;
   NSString *nameInContainer;
-  id container;
   NSString *owner;
+  id container;
 }
 
 + (id) objectWithName: (NSString *)_name inContainer:(id)_container;
index 1707caf35e8b6714e00aaea2622782883d91213c..46fffc69711f763e2e411bfba1491a5842ac44be 100644 (file)
@@ -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;
 }
 
index dd5f0245b5c2f7a20f5aeed07b7957790a8cb654..bad15487b60ea72ffe6fa1b6f6f936300285eb9d 100644 (file)
     SOGoRootPage = {
     };
     SOGoUserFolder = {
+      methods = {
+        view = { 
+          protectedBy = "<public>";
+          pageName = "SOGoUserHomePage"; 
+        };
+      };
     };
     SOGoGroupsFolder = {
       methods = {