From 919858a5599ebfbf0eb638d98034c936a8b4cbdd Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 27 Jul 2009 21:30:08 +0000 Subject: [PATCH] Monotone-Parent: 162b436b68eff06f343e4554025a4cd63e47fc2f Monotone-Revision: c6303bf32ace41498a75993116922dcd96cd4ad5 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-07-27T21:30:08 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxCalListingActions.m | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index f6d226ee5..187f79895 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -314,9 +314,7 @@ static NSArray *tasksFields = nil; NSString *role; infos = [NSMutableArray array]; - marker = [NSNull null]; - clientObject = [self clientObject]; folders = [[clientObject subFolders] objectEnumerator]; @@ -336,18 +334,18 @@ static NSArray *tasksFields = nil; { if ([fields containsObject: @"editable"]) { - role = - [currentFolder roleForComponentsWithAccessClass: - [[newInfo objectForKey: @"c_classification"] intValue] - forUser: [[context activeUser] login]]; - if ([role isEqualToString: @"ComponentModifier"] - || [role length] == 0) - [newInfo setObject: [NSNumber numberWithInt: 1] - forKey: @"editable"]; - else - [newInfo setObject: [NSNumber numberWithInt: 0] - forKey: @"editable"]; - } + role = + [currentFolder roleForComponentsWithAccessClass: + [[newInfo objectForKey: @"c_classification"] intValue] + forUser: userLogin]; + if ([role isEqualToString: @"ComponentModifier"] + || [role length] == 0) + [newInfo setObject: [NSNumber numberWithInt: 1] + forKey: @"editable"]; + else + [newInfo setObject: [NSNumber numberWithInt: 0] + forKey: @"editable"]; + } [newInfo setObject: [currentFolder nameInContainer] forKey: @"c_folder"]; [newInfo setObject: [currentFolder ownerInContext: context]