diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m index 98d8875f4..166985886 100644 --- a/UI/Scheduler/UIxCalDayTable.m +++ b/UI/Scheduler/UIxCalDayTable.m @@ -204,7 +204,7 @@ end = [start dateByAddingYears: 0 months: 0 days: 0 hours: 0 minutes: 59 seconds: 59]; - apts = [self fetchCoreInfos]; + apts = [self fetchCoreAppointmentsInfos]; filtered = [NSMutableArray new]; [filtered autorelease]; diff --git a/UI/Scheduler/UIxCalDayView.m b/UI/Scheduler/UIxCalDayView.m index ad866714d..ef83fd6cc 100644 --- a/UI/Scheduler/UIxCalDayView.m +++ b/UI/Scheduler/UIxCalDayView.m @@ -181,7 +181,7 @@ - (NSArray *) appointments { - return [self fetchCoreInfos]; + return [self fetchCoreAppointmentsInfos]; } - (NSArray *)aptsForCurrentDate { diff --git a/UI/Scheduler/UIxCalMonthOverview.m b/UI/Scheduler/UIxCalMonthOverview.m index 86afd01bc..ad7b63923 100644 --- a/UI/Scheduler/UIxCalMonthOverview.m +++ b/UI/Scheduler/UIxCalMonthOverview.m @@ -97,7 +97,7 @@ - (NSArray *)appointments { - return [self fetchCoreInfos]; + return [self fetchCoreAppointmentsInfos]; } @end /* UIxCalMonthOverview */ diff --git a/UI/Scheduler/UIxCalScheduleOverview.m b/UI/Scheduler/UIxCalScheduleOverview.m index 3b230aed3..5fe7a0f38 100644 --- a/UI/Scheduler/UIxCalScheduleOverview.m +++ b/UI/Scheduler/UIxCalScheduleOverview.m @@ -296,7 +296,7 @@ return self->foreignApts; } -- (void)fetchInfos { +- (void) fetchInfos { static NSArray *orders = nil; id aptFolder; NSArray *apts; @@ -311,8 +311,9 @@ } aptFolder = [self clientObject]; - apts = [aptFolder fetchCoreInfosFrom:[self startDate] - to:[self endDate]]; + apts = [aptFolder fetchCoreInfosFrom: [self startDate] + to: [self endDate] + component: @"vevent"]; userEmail = [self emailForUser]; count = [apts count]; diff --git a/UI/Scheduler/UIxCalWeekListview.m b/UI/Scheduler/UIxCalWeekListview.m index 355dab83e..7de0d40e0 100644 --- a/UI/Scheduler/UIxCalWeekListview.m +++ b/UI/Scheduler/UIxCalWeekListview.m @@ -52,18 +52,18 @@ /* NOTE: this fetches coreInfos instead of overviewInfos * as is done in the superclass! */ -- (NSArray *)fetchCoreInfos { - if (!self->appointments) { - id folder; - NSCalendarDate *sd, *ed; +// - (NSArray *)fetchCoreInfos { +// if (!self->appointments) { +// id folder; +// NSCalendarDate *sd, *ed; - folder = [self clientObject]; - sd = [self startDate]; - ed = [self endDate]; - [self setAppointments:[folder fetchCoreInfosFrom:sd to:ed]]; - } - return self->appointments; -} +// folder = [self clientObject]; +// sd = [self startDate]; +// ed = [self endDate]; +// [self setAppointments: [folder fetchCoreAppointmentsInfos]]; +// } +// return self->appointments; +// } /* accessors */ diff --git a/UI/Scheduler/UIxCalWeekView.m b/UI/Scheduler/UIxCalWeekView.m index 57875ff28..ab520323a 100644 --- a/UI/Scheduler/UIxCalWeekView.m +++ b/UI/Scheduler/UIxCalWeekView.m @@ -54,7 +54,7 @@ - (NSArray *) appointments { - return [self fetchCoreInfos]; + return [self fetchCoreAppointmentsInfos]; } /* URLs */