LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: df50b8dd4bddcee4db165e9ac01d6b6a17d8ad04 

Monotone-Revision: 42fb4d40a22288da8859b369ec18915fb6e1164c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-12T20:26:01
maint-2.0.2
Wolfgang Sourdeau 2012-04-12 20:26:01 +00:00
parent f09c4d5be1
commit 50e160f895
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2012-04-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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:):

3
UI/Scheduler/UIxCalListingActions.m
View File

@ -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]];