From 1e2579a6649143079e7ecedfae4a44f7cd0678a4 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 17 Sep 2010 20:37:20 +0000 Subject: [PATCH] See Changelog Monotone-Parent: d3787adfd45555cf1464e5cc2b35120c2f9b764a Monotone-Revision: b8fdd2b522b773a7377d9617f8dce71cb94ce7db Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-09-17T20:37:20 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/SOGo/SOGoGCSFolder.m | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9f195a6a2..134449950 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ * SoObjects/SOGo/SOGoGCSFolder.m (-renameTo:): don't act as the owner of the folder when user is a superuser. + (-_realAclsForUser:forObjectAtPath:): don't ignore "None" access + right in order to avoid rollbacking to default roles for the + calendar module (SOGoCalendarDefaultRoles) when the user has + specifically no rights. 2010-09-14 Ludovic Marcotte diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index b697fda62..aba227d92 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -1490,8 +1490,7 @@ static NSArray *childRecordFields = nil; if (!acls) { acls = [self _fetchAclsForUser: uid forObjectAtPath: objectPath]; - if (!acls - || ([acls count] == 1 && [acls containsObject: SOGoRole_None])) + if (!acls) acls = [NSArray array]; [self _cacheRoles: acls forUser: uid forObjectAtPath: objectPath]; }