From 50e160f89501d21790a016464abf7134071480e6 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 12 Apr 2012 20:26:01 +0000 Subject: [PATCH] Monotone-Parent: df50b8dd4bddcee4db165e9ac01d6b6a17d8ad04 Monotone-Revision: 42fb4d40a22288da8859b369ec18915fb6e1164c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-04-12T20:26:01 --- ChangeLog | 5 +++++ UI/Scheduler/UIxCalListingActions.m | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6d330315..2263afd30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2012-04-12 Wolfgang Sourdeau + * UI/Scheduler/UIxCalListingActions.m + (_fetchFields:forComponentOfType:): do not check for + "showCalendarTasks" since it is now handled at the + SOGoApopintmentFolder level. + * SoObjects/Appointments/SOGoAppointmentFolder.m (-bareFetchFields: ..., (-fetchFields:from:to:title:component:additionalFilters:includeProtectedInformation:): diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index 854537bd8..b6ef06590 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -322,8 +322,7 @@ static NSArray *tasksFields = nil; folders = [[clientObject subFolders] objectEnumerator]; while ((currentFolder = [folders nextObject])) { - if ([currentFolder isActive] - && (![component isEqualToString: @"vtodo"] || [currentFolder showCalendarTasks])) + if ([currentFolder isActive]) { folderIsRemote = [currentFolder isKindOfClass: [SOGoWebAppointmentFolder class]];