From 061ac2aa4512b363671da8dd4ca080021f1abc6a Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 2 May 2008 22:51:49 +0000
Subject: [PATCH] Monotone-Parent: 040674761c27c58b25e81406da993b3e7189cf9c
 Monotone-Revision: 7f5165a92f3e95ebbe203abdc6531d84a48f20af

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-05-02T22:51:49
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  3 ++
 .../Appointments/SOGoAppointmentFolder.h      |  8 ++--
 UI/MainUI/GNUmakefile                         |  6 +--
 UI/MainUI/product.plist                       | 44 ++++++++++---------
 UI/SOGoUI/UIxComponent.m                      | 15 ++++---
 5 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed9456cd7..2ac26fa38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/SOGoUI/UIxComponent.m ([UIxComponent -applicationPath]):
+	disabled all mentions of "SOGoGroupFolder*".
+
 	* SoObjects/SOGo/SOGoDAVRendererTypes.[hm]: removed subclass
 	module, superseded by the new method mentionned below.
 
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.h b/SoObjects/Appointments/SOGoAppointmentFolder.h
index 8b0d97ed5..7e340bba7 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.h
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.h
@@ -113,10 +113,10 @@
 - (NSArray *) lookupCalendarFoldersForICalPerson: (NSArray *) _persons
                                        inContext: (id) _ctx;
 
-- (id) lookupGroupFolderForUIDs: (NSArray *) _uids
-                      inContext: (id) _ctx;
-- (id) lookupGroupCalendarFolderForUIDs: (NSArray *) _uids
-                              inContext: (id) _ctx;
+// - (id) lookupGroupFolderForUIDs: (NSArray *) _uids
+//                       inContext: (id) _ctx;
+// - (id) lookupGroupCalendarFolderForUIDs: (NSArray *) _uids
+//                               inContext: (id) _ctx;
 
 /* bulk fetches */
 
diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile
index 2d0bf7f8e..6ed1e7e5d 100644
--- a/UI/MainUI/GNUmakefile
+++ b/UI/MainUI/GNUmakefile
@@ -11,9 +11,9 @@ MainUI_LANGUAGES = English French German Italian
 MainUI_OBJC_FILES += \
 	MainUIProduct.m		\
 	SOGoRootPage.m		\
-	SOGoUserHomePage.m	\
-	SOGoGroupPage.m		\
-	SOGoGroupsPage.m	\
+	SOGoUserHomePage.m
+# 	SOGoGroupPage.m		\
+# 	SOGoGroupsPage.m	\
 
 MainUI_RESOURCE_FILES += 	\
 	Version			\
diff --git a/UI/MainUI/product.plist b/UI/MainUI/product.plist
index d00f74aae..ce67497dd 100644
--- a/UI/MainUI/product.plist
+++ b/UI/MainUI/product.plist
@@ -26,7 +26,7 @@
         "Add Documents, Images, and Files" = ( "Owner", "ObjectCreator" );
 	"Add Folders" = ( "Owner", "FolderCreator" );
         "ReadAcls" = ( "Owner" );
-        "SaveAcls" = ( "Owner" );
+        "Change Permissions" = ( "Owner" );
         "Delete Objects" = ( "Owner", "ObjectEraser" );
         "WebDAV Access" = ( "Owner", "ObjectViewer", "ObjectEditor", "ObjectCreator", "ObjectEraser" );
       };
@@ -67,6 +67,8 @@
       defaultRoles = {
 	"Access Contents Information" = ( "Authenticated" );
         "WebDAV Access" = ( "Authenticated" );
+	"Add Folders" = ( "Owner" );
+	"Delete Objects" = ( "Owner" );
       };
     };
     SOGoUserFolder = {
@@ -136,22 +138,22 @@
 	};
       };
     };
-    SOGoGroupsFolder = {
-      methods = {
-        index = { 
-          protectedBy = "View";
-          pageName = "SOGoGroupsPage"; 
-        };
-      };
-    };
-    SOGoGroupFolder = {
-      methods = {
-        index = { 
-          protectedBy = "View";
-          pageName = "SOGoGroupPage"; 
-        };
-      };
-    };
+//     SOGoGroupsFolder = {
+//       methods = {
+//         index = { 
+//           protectedBy = "View";
+//           pageName = "SOGoGroupsPage"; 
+//         };
+//       };
+//     };
+//     SOGoGroupFolder = {
+//       methods = {
+//         index = { 
+//           protectedBy = "View";
+//           pageName = "SOGoGroupPage"; 
+//         };
+//       };
+//     };
     SOGoFreeBusyObject = {
       methods = {
         ajaxRead = { 
@@ -161,9 +163,9 @@
         };
       };
     };
-    SOGoCustomGroupFolder = {
-      methods = {
-      };
-    };
+//     SOGoCustomGroupFolder = {
+//       methods = {
+//       };
+//     };
   };
 }
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 0a707bc5c..9a29fe562 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -41,7 +41,7 @@
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/SOGoObject.h>
 #import <SoObjects/SOGo/SOGoContentObject.h>
-#import <SoObjects/SOGo/SOGoCustomGroupFolder.h>
+// #import <SoObjects/SOGo/SOGoCustomGroupFolder.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
 
 #import "UIxJSClose.h"
@@ -318,23 +318,26 @@ static BOOL uixDebugEnabled = NO;
 {
   SOGoObject *currentClient, *parent;
   BOOL found;
-  Class objectClass, groupFolderClass, userFolderClass;
+  Class objectClass, userFolderClass;
+// , groupFolderClass
 
   currentClient = [self clientObject];
   if (currentClient
       && [currentClient isKindOfClass: [SOGoObject class]])
     {
-      groupFolderClass = [SOGoCustomGroupFolder class];
+//       groupFolderClass = [SOGoCustomGroupFolder class];
       userFolderClass = [SOGoUserFolder class];
 
       objectClass = [currentClient class];
-      found = (objectClass == groupFolderClass || objectClass == userFolderClass);
+//       found = (objectClass == groupFolderClass || objectClass == userFolderClass);
+      found = (objectClass == userFolderClass);
       while (!found && currentClient)
 	{
 	  parent = [currentClient container];
 	  objectClass = [parent class];
-	  if (objectClass == groupFolderClass
-	      || objectClass == userFolderClass)
+	  if (// objectClass == groupFolderClass
+// 	      || 
+	      objectClass == userFolderClass)
 	    found = YES;
 	  else
 	    currentClient = parent;