amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-17 01:15:24 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 23e776c8c54fe02739326119a5d6519e81abc605

Browse Source 
Monotone-Revision: 6a2b142b86238b6988137e5c25e428fc7a5f4ef7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-07-04T20:10:45
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-07-04 20:10:45 +00:00
parent 1844d390df
commit 2ba7ae4c89
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+7
View File
@@ -1,5 +1,12 @@
2007-07-04 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
([SOGoAppointmentFolder -calendarFolders]): read the calendar
folders of the user to whom this folder belongs instead of the
active user. This way, a delegate user will be able to have the
same view that the original user has if he connects from his user
directory.
* Main/SOGo.m ([SOGo -lookupUser:_keyinContext:]): check if the
user exists before creating the SOGoUserFolder instance. If not,
returns nil.
SoObjects/Appointments/SOGoAppointmentFolder.m
+4 -3
View File
@@ -1229,20 +1229,21 @@ static NSNumber *sharedYes = nil;
{
NSMutableDictionary *userCalendar, *calendarDict;
NSMutableArray *calendarFolders;
SOGoUser *activeUser;
SOGoUser *calendarUser;
BOOL firstActive;
calendarFolders = [NSMutableArray new];
[calendarFolders autorelease];
activeUser = [context activeUser];
calendarUser = [SOGoUser userWithLogin: [self ownerInContext: context]
roles: nil];
userCalendar = [NSMutableDictionary new];
[userCalendar autorelease];
[userCalendar setObject: @"/" forKey: @"folder"];
[userCalendar setObject: @"Calendar" forKey: @"displayName"];
[calendarFolders addObject: userCalendar];
calendarDict = [[activeUser userSettings] objectForKey: @"Calendar"];
calendarDict = [[calendarUser userSettings] objectForKey: @"Calendar"];
firstActive = [[calendarDict objectForKey: @"activateUserFolder"] boolValue];
firstActive = ([self _appendSubscribedFolders:
[calendarDict objectForKey: @"SubscribedFolders"]