LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 040674761c27c58b25e81406da993b3e7189cf9c 

Monotone-Revision: 7f5165a92f3e95ebbe203abdc6531d84a48f20af

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-05-02T22:51:49
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2008-05-02 22:51:49 +00:00
parent 5c0e33e916
commit 061ac2aa45
5 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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.

8
SoObjects/Appointments/SOGoAppointmentFolder.h
View File

@ -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 */

6
UI/MainUI/GNUmakefile
View File

@ -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 \

44
UI/MainUI/product.plist
View File

@ -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 = {
// };
// };
};
}

15
UI/SOGoUI/UIxComponent.m
View File

@ -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;