Monotone-Parent: df50b8dd4bddcee4db165e9ac01d6b6a17d8ad04
Monotone-Revision: 42fb4d40a22288da8859b369ec18915fb6e1164c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-04-12T20:26:01maint-2.0.2
parent
f09c4d5be1
commit
50e160f895
|
@ -1,5 +1,10 @@
|
||||||
2012-04-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
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
|
* SoObjects/Appointments/SOGoAppointmentFolder.m
|
||||||
(-bareFetchFields: ...,
|
(-bareFetchFields: ...,
|
||||||
(-fetchFields:from:to:title:component:additionalFilters:includeProtectedInformation:):
|
(-fetchFields:from:to:title:component:additionalFilters:includeProtectedInformation:):
|
||||||
|
|
|
@ -322,8 +322,7 @@ static NSArray *tasksFields = nil;
|
||||||
folders = [[clientObject subFolders] objectEnumerator];
|
folders = [[clientObject subFolders] objectEnumerator];
|
||||||
while ((currentFolder = [folders nextObject]))
|
while ((currentFolder = [folders nextObject]))
|
||||||
{
|
{
|
||||||
if ([currentFolder isActive]
|
if ([currentFolder isActive])
|
||||||
&& (![component isEqualToString: @"vtodo"] || [currentFolder showCalendarTasks]))
|
|
||||||
{
|
{
|
||||||
folderIsRemote
|
folderIsRemote
|
||||||
= [currentFolder isKindOfClass: [SOGoWebAppointmentFolder class]];
|
= [currentFolder isKindOfClass: [SOGoWebAppointmentFolder class]];
|
||||||
|
|
Loading…
Reference in New Issue