From bcf6d7f1c522528f0cf46171ccf7efc3393ba863 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 16 Oct 2006 18:43:14 +0000 Subject: [PATCH] Monotone-Parent: 77ae6659af75997724f5042923c200e84f904c7c Monotone-Revision: c9af41ca9ec70a19cc4d97559b662f72c45c4f97 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-16T18:43:14 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoAppointmentFolder.m | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0b8d21db0..d1d7b0612 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-10-16 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoAppointmentFolder.m + ([SOGoAppointmentFolder + -fetchFields:_fieldsfromFolder:_folderfrom:_startDateto:_endDatecomponent:_component]): associate each returned record with the owner of the table they are retrieved from. + * SoObjects/SOGo/NSObject+Owner.[hm]: new extension module to NSObject to associate an instance with a user. diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 1d1959d17..dd3129b09 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -21,6 +21,7 @@ #import #import +#import #import #import #import @@ -579,7 +580,7 @@ static NSNumber *sharedYes = nil; EOQualifier *qualifier; NSMutableArray *fields, *ma = nil; NSArray *records; - NSString *sql, *dateSqlString, *componentSqlString; + NSString *sql, *dateSqlString, *componentSqlString, *owner; NGCalendarDateRange *r; if (_folder == nil) { @@ -649,6 +650,8 @@ static NSNumber *sharedYes = nil; records = [self fixupCyclicRecords: records fetchRange: r]; if (!ma) ma = [NSMutableArray arrayWithCapacity: [records count]]; + + owner = [self ownerInContext: nil]; [ma addObjectsFromArray: records]; } else if (!ma) @@ -666,6 +669,9 @@ static NSNumber *sharedYes = nil; if (logger) [self debugWithFormat:@"returning %i records", [ma count]]; + [ma makeObjectsPerformSelector: @selector (setOwnerByLogin:) + withObject: owner]; + return ma; }