From 4948aca14a785eef037d2aa262b3000987dd3cb6 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 26 Apr 2007 01:13:55 +0000 Subject: [PATCH] Monotone-Parent: be54fe500757d5b3077ad04c8c9a43cf4088ec61 Monotone-Revision: 64210c1ed841d8f02caf31f0c0e336b0fa9e37df Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-04-26T01:13:55 Monotone-Branch: ca.inverse.sogo --- SoObjects/Appointments/product.plist | 41 +++++++++++++---------- SoObjects/Mailer/product.plist | 42 ++++++++++------------- UI/Common/product.plist | 10 +++--- UI/MainUI/product.plist | 36 +++++--------------- UI/Scheduler/product.plist | 50 ++++++++++++---------------- 5 files changed, 75 insertions(+), 104 deletions(-) diff --git a/SoObjects/Appointments/product.plist b/SoObjects/Appointments/product.plist index a45e744d4..91f693d4a 100644 --- a/SoObjects/Appointments/product.plist +++ b/SoObjects/Appointments/product.plist @@ -9,35 +9,40 @@ classes = { SOGoAppointmentFolder = { - superclass = "SOGoFolder"; + superclass = "SOGoFolder"; defaultRoles = { - "View" = ( "Owner", "Delegate", "Assistant" ); - "FreeBusyLookup" = ( "Owner", "Delegate", "Assistant", "FreeBusy" ); - "Add Documents, Images, and Files" = ( "Owner", "Delegate" ); - "Access Contents Information" = ( "Owner", "Delegate", "Assistant" ); - "Delete Objects" = ( "Owner", "Organizer", "Delegate" ); + "FreeBusyLookup" = ( "Owner", "FreeBusy", "AuthorizedSubscriber" ); + "ViewWholePublicRecords" = ( "Owner", "PublicResponder", "PublicModifier", "PublicViewer" ); + "ViewDAndTOfPublicRecords" = ( "Owner", "PublicDAndTViewer" ); + "ModifyPublicRecords" = ( "Owner", "PublicModifier" ); + "RespondToPublicRecords" = ( "Owner", "PublicModifier", "PublicResponder" ); + "ViewWholePrivateRecords" = ( "Owner", "PrivateResponder", "PrivateModifier", "PrivateViewer" ); + "ViewDAndTOfPrivateRecords" = ( "Owner", "PrivateDAndTViewer" ); + "ModifyPrivateRecords" = ( "Owner", "PrivateModifier" ); + "RespondToPrivateRecords" = ( "Owner", "PrivateModifier", "PrivateResponder" ); + "ViewWholeConfidentialRecords" = ( "Owner", "ConfidentialResponder", "ConfidentialModifier", "ConfidentialViewer" ); + "ViewDAndTOfConfidentialRecords" = ( "Owner", "ConfidentialDAndTViewer" ); + "ModifyConfidentialRecords" = ( "Owner", "ConfidentialModifier" ); + "RespondToConfidentialRecords" = ( "Owner", "ConfidentialModifier", "ConfidentialResponder" ); }; }; - SOGoGroupAppointmentFolder = { superclass = "SOGoAppointmentFolder"; }; - - SOGoAppointmentObject = { + SOGoCalendarComponent = { superclass = "SOGoContentObject"; defaultRoles = { - "View" = ( "Owner", "Delegate", "Organizer", "Authenticated" ); - "Change Images and Files" = ( "Owner", "Delegate", "Organizer" ); - "Access Contents Information" = ( "Owner", "Delegate", "Assistant" ); + "ViewAllComponent" = ( "Owner", "Organizer", "Participant", "ComponentViewer", "ComponentModifier" ); + "ViewDAndT" = ( "Organizer", "Participant", "ComponentDAndTViewer" ); + "ModifyComponent" = ( "Owner", "ComponentModifier" ); + "RespondToComponent" = ( "Participant", "ComponentResponder" ); }; }; + SOGoAppointmentObject = { + superclass = "SOGoCalendarComponent"; + }; SOGoTaskObject = { - superclass = "SOGoContentObject"; - defaultRoles = { - "View" = ( "Owner", "Delegate", "Organizer", "Authenticated" ); - "Change Images and Files" = ( "Owner", "Delegate", "Organizer" ); - "Access Contents Information" = ( "Owner", "Delegate", "Assistant" ); - }; + superclass = "SOGoCalendarComponent"; }; SOGoFreeBusyObject = { superclass = "SOGoContentObject"; diff --git a/SoObjects/Mailer/product.plist b/SoObjects/Mailer/product.plist index 2ace375aa..a28051643 100644 --- a/SoObjects/Mailer/product.plist +++ b/SoObjects/Mailer/product.plist @@ -11,59 +11,54 @@ SOGoMailBaseObject = { superclass = "SOGoObject"; }; - SOGoMailAccounts = { superclass = "SOGoMailBaseObject"; defaultRoles = { - "Add Documents, Images, and Files" = ( "Owner", "Delegate" ); - "View" = ( "Owner", "Delegate", "Assistant" ); - "WebDAV Access" = ( "Owner", "Delegate", "Assistant" ); - "Access Contents Information" = ( "Owner", "Assistant", "Delegate" ); - "ReadAcls" = ( "Owner", "Delegate", "Assistant" ); + "View" = ( "Owner", "AuthorizedSubscriber" ); + "Access Contents Information" = ( "Owner", "AuthorizedSubscriber" ); + "Add Documents, Images, and Files" = ( "Owner", "ObjectCreator" ); + "Delete Objects" = ( "Owner", "ObjectEraser" ); + "WebDAV Access" = ( "Owner", "AuthorizedSubscriber" ); + "ReadAcls" = ( "Owner", "AuthorizedSubscriber" ); "SaveAcls" = ( "Owner" ); }; }; - SOGoMailAccount = { superclass = "SOGoMailBaseObject"; defaultRoles = { - "Add Folders" = ( "Owner", "Delegate" ); - "Add Documents, Images, and Files" = ( "Owner", "Delegate" ); - "View" = ( "Owner", "Delegate", "Assistant" ); - "WebDAV Access" = ( "Owner", "Delegate", "Assistant" ); - "Access Contents Information" = ( "Owner", "Assistant", "Delegate" ); - "ReadAcls" = ( "Owner", "Delegate", "Assistant" ); + "View" = ( "Owner", "AuthorizedSubscriber" ); + "Access Contents Information" = ( "Owner", "AuthorizedSubscriber" ); + "Add Documents, Images, and Files" = ( "Owner", "ObjectCreator" ); + "Delete Objects" = ( "Owner", "ObjectEraser" ); + "WebDAV Access" = ( "Owner", "AuthorizedSubscriber" ); + "ReadAcls" = ( "Owner", "AuthorizedSubscriber" ); "SaveAcls" = ( "Owner" ); }; }; SOGoSharedMailAccount = { superclass = "SOGoMailAccount"; }; - SOGoMailFolder = { superclass = "SOGoMailBaseObject"; defaultRoles = { - "Add Folders" = ( "Owner", "Delegate" ); - "Add Documents, Images, and Files" = ( "Owner", "Delegate" ); - "View" = ( "Owner", "Delegate", "Assistant" ); - "WebDAV Access" = ( "Owner", "Delegate", "Assistant" ); - "Access Contents Information" = ( "Owner", "Assistant", "Delegate" ); - "ReadAcls" = ( "Owner", "Delegate", "Assistant" ); + "View" = ( "Owner", "AuthorizedSubscriber" ); + "Access Contents Information" = ( "Owner", "AuthorizedSubscriber" ); + "Add Documents, Images, and Files" = ( "Owner", "ObjectCreator" ); + "Delete Objects" = ( "Owner", "ObjectEraser" ); + "WebDAV Access" = ( "Owner", "AuthorizedSubscriber" ); + "ReadAcls" = ( "Owner", "AuthorizedSubscriber" ); "SaveAcls" = ( "Owner" ); }; }; SOGoSharedInboxFolder = { superclass = "SOGoMailFolder"; }; - SOGoTrashFolder = { superclass = "SOGoMailFolder"; }; - SOGoMailObject = { superclass = "SOGoMailBaseObject"; }; - SOGoMailBodyPart = { superclass = "SOGoMailBaseObject"; }; @@ -79,7 +74,6 @@ SOGoVCardMailBodyPart = { superclass = "SOGoMailBodyPart"; }; - SOGoDraftsFolder = { superclass = "SOGoMailBaseObject"; }; diff --git a/UI/Common/product.plist b/UI/Common/product.plist index fc92e3925..0d94f25e6 100644 --- a/UI/Common/product.plist +++ b/UI/Common/product.plist @@ -60,27 +60,27 @@ SOGoFolder = { methods = { subscribe = { - protectedBy = "View"; + protectedBy = ""; actionClass = "UIxFolderActions"; actionName = "subscribe"; }; unsubscribe = { - protectedBy = "View"; + protectedBy = ""; actionClass = "UIxFolderActions"; actionName = "unsubscribe"; }; canAccessContent = { - protectedBy = "View"; + protectedBy = ""; actionClass = "UIxFolderActions"; actionName = "canAccessContent"; }; activateFolder = { - protectedBy = "View"; + protectedBy = ""; actionClass = "UIxFolderActions"; actionName = "activateFolder"; }; deactivateFolder = { - protectedBy = "View"; + protectedBy = ""; actionClass = "UIxFolderActions"; actionName = "deactivateFolder"; }; diff --git a/UI/MainUI/product.plist b/UI/MainUI/product.plist index a189d3c30..a430dcf1d 100644 --- a/UI/MainUI/product.plist +++ b/UI/MainUI/product.plist @@ -15,40 +15,20 @@ "View" = ( "Authenticated", "FreeBusy" ); }; }; - SOGoUserFolder = { - superclass = "SOGoFolder"; + SOGoFolder = { + superclass = "SOGoObject"; protectedBy = ""; defaultAccess = "allow"; defaultRoles = { - "View" = ( "Owner" ); - }; - /* protectedBy = "HomePage Access"; */ - }; - SOGoFolder = { - superclass = "SOGoObject"; - protectedBy = "Access Contents Information"; - defaultRoles = { - "Add Documents, Images, and Files" = ( "Owner", "Delegate" ); - "View" = ( "Owner", "Delegate", "Assistant" ); - "WebDAV Access" = ( "Owner", "Delegate", "Assistant" ); - "Access Contents Information" = ( "Owner", "Assistant", "Delegate" ); - "ReadAcls" = ( "Owner", "Delegate", "Assistant" ); + "Add Documents, Images, and Files" = ( "Owner", "ObjectCreator" ); + "View" = ( "Owner", "AuthorizedSubscriber" ); + "Access Contents Information" = ( "Owner", "AuthorizedSubscriber" ); + "WebDAV Access" = ( "Owner", "AuthorizedSubscriber" ); + "ReadAcls" = ( "Owner", "AuthorizedSubscriber" ); "SaveAcls" = ( "Owner" ); - "Delete Objects" = ( "Owner", "Delegate" ); + "Delete Objects" = ( "Owner", "ObjectEraser" ); }; }; - SOGoGroupsFolder = { - superclass = "SOGoObject"; - protectedBy = "View"; - }; - SOGoGroupFolder = { - superclass = "SOGoObject"; - protectedBy = "View"; - }; - SOGoCustomGroupFolder = { - superclass = "SOGoGroupFolder"; - protectedBy = "View"; - }; }; categories = { diff --git a/UI/Scheduler/product.plist b/UI/Scheduler/product.plist index 37cf1a952..1a4a61d34 100644 --- a/UI/Scheduler/product.plist +++ b/UI/Scheduler/product.plist @@ -111,12 +111,14 @@ pageName = "UIxCalUserRightsEditor"; }; saveUserRights = { - protectedBy = "ReadAcls"; + protectedBy = "SaveAcls"; pageName = "UIxCalUserRightsEditor"; - actionName = "saveUserRights"; + actionName = "saveUserRights"; }; }; }; + SOGoCalendarComponent = { + }; SOGoAppointmentObject = { slots = { @@ -127,47 +129,42 @@ }; methods = { view = { - protectedBy = "View"; + protectedBy = "ViewAllComponent"; pageName = "UIxAppointmentView"; }; delete = { - protectedBy = "View"; + protectedBy = "Delete Objects"; pageName = "UIxAppointmentView"; actionName = "delete"; }; edit = { - protectedBy = "View"; + protectedBy = "ViewAllComponent"; pageName = "UIxAppointmentEditor"; }; editAsAppointment = { - protectedBy = "View"; + protectedBy = "ViewAllComponent"; pageName = "UIxAppointmentEditor"; }; save = { - protectedBy = "View"; + protectedBy = "ModifyComponent"; pageName = "UIxAppointmentEditor"; actionName = "save"; }; saveAsAppointment = { - protectedBy = "View"; + protectedBy = "ModifyComponent"; pageName = "UIxAppointmentEditor"; actionName = "save"; }; accept = { - protectedBy = "View"; + protectedBy = "RespondToComponent"; pageName = "UIxAppointmentEditor"; actionName = "accept"; }; decline = { - protectedBy = "View"; + protectedBy = "RespondToComponent"; pageName = "UIxAppointmentEditor"; actionName = "decline"; }; - test = { - protectedBy = "View"; - pageName = "UIxAppointmentEditor"; - actionName = "test"; - }; }; }; @@ -180,52 +177,47 @@ }; methods = { view = { - protectedBy = "View"; + protectedBy = "ViewAllComponent"; pageName = "UIxTaskView"; }; delete = { - protectedBy = "View"; + protectedBy = "Delete Objects"; pageName = "UIxTaskView"; actionName = "delete"; }; edit = { - protectedBy = "View"; + protectedBy = "ViewAllComponent"; pageName = "UIxTaskEditor"; }; editAsTask = { - protectedBy = "View"; + protectedBy = "ViewAllComponent"; pageName = "UIxTaskEditor"; }; save = { - protectedBy = "Change Images and Files"; + protectedBy = "ModifyComponent"; pageName = "UIxTaskEditor"; actionName = "save"; }; saveAsTask = { - protectedBy = "Change Images and Files"; + protectedBy = "ModifyComponent"; pageName = "UIxTaskEditor"; actionName = "save"; }; changeStatus = { - protectedBy = "Change Images and Files"; + protectedBy = "ModifyComponent"; pageName = "UIxTaskEditor"; actionName = "changeStatus"; }; accept = { - protectedBy = "Change Images and Files"; + protectedBy = "RespondToComponent"; pageName = "UIxTaskEditor"; actionName = "accept"; }; decline = { - protectedBy = "Change Images and Files"; + protectedBy = "RespondToComponent"; pageName = "UIxTaskEditor"; actionName = "decline"; }; - test = { - protectedBy = "View"; - pageName = "UIxTaskEditor"; - actionName = "test"; - }; }; }; };