amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 04:15:26 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 24e2e177451529a5708c7cc70a324ed3ce6c9a64

Browse Source 
Monotone-Revision: 827061cfd7bb39eead69601b6015cb0ff6ebf1f1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-12T23:45:23
This commit is contained in:
Wolfgang Sourdeau
2012-04-12 23:45:23 +00:00
parent c1885f5d03
commit c270e1e720
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAppointmentFolder.m
+18 -4
View File
@@ -556,8 +556,15 @@ static NSNumber *sharedYes = nil;
[title stringByReplacingString: @"'" withString: @"''"]]];
if (component)
[baseWhere addObject: [NSString stringWithFormat: @"c_component = '%@'",
component]];
{
if ([component isEqualToString: @"vtodo"] && ![self showCalendarTasks])
return [NSArray array];
else
[baseWhere addObject: [NSString stringWithFormat: @"c_component = '%@'",
component]];
}
else if (![self showCalendarTasks])
[baseWhere addObject: @"c_component != 'vtodo'"];
if ([filters length])
[baseWhere addObject: filters];
@@ -1108,8 +1115,15 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
baseWhere = [NSMutableArray arrayWithCapacity: 32];
if (_component)
[baseWhere addObject: [NSMutableString stringWithFormat: @"c_component = '%@'",
_component]];
{
if ([_component isEqualToString: @"vtodo"] && ![self showCalendarTasks])
return [NSArray array];
else
[baseWhere addObject: [NSString stringWithFormat: @"c_component = '%@'",
_component]];
}
else if (![self showCalendarTasks])
[baseWhere addObject: @"c_component != 'vtodo'"];
if (_startDate)
{