From ab2883af195fc8b816276b3b0e2f2f8d88c29e2c Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 12 Jun 2009 15:55:04 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 73c5f4e36eca619041a58d0413112a5ea43ae3d6 Monotone-Revision: 571d9bfb5bd40cb2435fe9c4ecec1069f13f7a7d Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-06-12T15:55:04 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ UI/Contacts/UIxContactEditor.m | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7669b9008..0dec38540 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-06-12 Francis Lachapelle + + * UI/Contacts/UIxContactEditor.m ([UIxContactEditor + -addressBooksList]): LDAP-based addressbooks must not be + editable, even for super users. + 2009-06-09 Wolfgang Sourdeau * SoObjects/Appointments/SOGoFreeBusyObject.m diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m index e03b307d1..5e6f5fb23 100644 --- a/UI/Contacts/UIxContactEditor.m +++ b/UI/Contacts/UIxContactEditor.m @@ -186,9 +186,10 @@ while (currentFolder) { if ([currentFolder isEqual: folder] || - ![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles - onObject: currentFolder - inContext: context]) + ([currentFolder isKindOfClass: [SOGoContactGCSFolder class]] && + ![sm validatePermission: SoPerm_AddDocumentsImagesAndFiles + onObject: currentFolder + inContext: context])) [addressBooksList addObject: currentFolder]; currentFolder = [folders nextObject]; }