From ef0adcb4b7863395197befb19f0eec16c724ea68 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 1 Jun 2007 20:53:33 +0000 Subject: [PATCH] Monotone-Parent: a3af3c8ec093a513104f71c796d21d4ad5b438a5 Monotone-Revision: bfa1eaa1a465a26614ff646159f8de7c177bc878 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-01T20:53:33 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ SoObjects/SOGo/SOGoPermissions.h | 8 +++++--- SoObjects/SOGo/SOGoPermissions.m | 5 +++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d415e848..02697252e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-06-01 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoPermissions.m: added roles "FolderViewer" and + "FolderEraser" and special permission "Access Object". Removed + role "SOGoMailRole_MessageEraser" since "SOGoRole_ObjectEraser" + can be used instead. Removed "FolderReader" since it is useless. + * SoObjects/Contacts/SOGoContactGCSEntry.m ([SOGoContactGCSEntry -vCard]): directly use the "content" ivar since it is initialized during object creation. diff --git a/SoObjects/SOGo/SOGoPermissions.h b/SoObjects/SOGo/SOGoPermissions.h index 2b4e60cf5..53ed0e965 100644 --- a/SoObjects/SOGo/SOGoPermissions.h +++ b/SoObjects/SOGo/SOGoPermissions.h @@ -28,13 +28,15 @@ #import extern NSString *SOGoRole_ObjectCreator; -extern NSString *SOGoRole_ObjectReader; extern NSString *SOGoRole_ObjectEraser; +extern NSString *SOGoRole_ObjectReader; extern NSString *SOGoRole_ObjectViewer; extern NSString *SOGoRole_ObjectEditor; extern NSString *SOGoRole_FolderCreator; -extern NSString *SOGoRole_FolderReader; +extern NSString *SOGoRole_FolderEraser; +extern NSString *SOGoRole_FolderViewer; + extern NSString *SOGoRole_AuthorizedSubscriber; extern NSString *SOGoRole_None; extern NSString *SOGoRole_FreeBusy; @@ -46,7 +48,6 @@ extern NSString *SOGoMailRole_Poster; extern NSString *SOGoMailRole_Expunger; extern NSString *SOGoMailRole_Creator; extern NSString *SOGoMailRole_Administrator; -extern NSString *SOGoMailRole_MessageEraser; extern NSString *SOGoCalendarRole_Organizer; extern NSString *SOGoCalendarRole_Participant; @@ -69,6 +70,7 @@ extern NSString *SOGoCalendarRole_ComponentDAndTViewer; extern NSString *SOGoCalendarRole_ComponentModifier; extern NSString *SOGoCalendarRole_ComponentResponder; +extern NSString *SOGoPerm_AccessObject; extern NSString *SOGoPerm_ReadAcls; extern NSString *SOGoPerm_FreeBusyLookup; diff --git a/SoObjects/SOGo/SOGoPermissions.m b/SoObjects/SOGo/SOGoPermissions.m index f5cb1f172..0e9769151 100644 --- a/SoObjects/SOGo/SOGoPermissions.m +++ b/SoObjects/SOGo/SOGoPermissions.m @@ -28,10 +28,10 @@ NSString *SOGoRole_ObjectEraser = @"ObjectEraser"; NSString *SOGoRole_ObjectViewer = @"ObjectViewer"; NSString *SOGoRole_ObjectReader = @"ObjectReader"; NSString *SOGoRole_ObjectEditor = @"ObjectEditor"; + NSString *SOGoRole_FolderCreator = @"FolderCreator"; NSString *SOGoRole_FolderEraser = @"FolderEraser"; -NSString *SOGoRole_FolderViewer = @"FolderViewer"; -NSString *SOGoRole_FolderReader = @"FolderReader"; + NSString *SOGoRole_AuthorizedSubscriber = @"AuthorizedSubscriber"; NSString *SOGoRole_None = @"None"; @@ -73,6 +73,7 @@ NSString *SOGoMailRole_Administrator = @"MailAdministrator"; NSString *SOGoMailRole_MessageEraser = @"MailMessageEraser"; /* permissions */ +NSString *SOGoPerm_AccessObject= @"Access Object"; NSString *SOGoPerm_ReadAcls = @"ReadAcls"; /* the equivalent of "read-acl" in the WebDAV acls spec, which is currently missing from SOPE */