From 42e25be6bc576a58e7eee8e57eb47d6148bf9675 Mon Sep 17 00:00:00 2001 From: znek Date: Tue, 19 Jul 2005 11:21:39 +0000 Subject: [PATCH] reversed filter logic git-svn-id: http://svn.opengroupware.org/SOGo/trunk@824 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/Scheduler/ChangeLog | 5 +++++ SOGo/UI/Scheduler/UIxCalView.m | 6 +++--- SOGo/UI/Scheduler/Version | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index f346ac44..ee6dad0e 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,5 +1,10 @@ 2005-07-19 Marcus Mueller + * v0.9.140 + + * UIxCalView.m: reversed shouldAdd logic in filterAppointments to do + the right thing ... + * v0.9.139 * UIxAppointmentEditor.m: fixed automatic participants addition diff --git a/SOGo/UI/Scheduler/UIxCalView.m b/SOGo/UI/Scheduler/UIxCalView.m index 692efd77..2bf44d1f 100644 --- a/SOGo/UI/Scheduler/UIxCalView.m +++ b/SOGo/UI/Scheduler/UIxCalView.m @@ -95,7 +95,7 @@ static BOOL shouldDisplayWeekend = NO; unsigned p, pCount; BOOL shouldAdd; - shouldAdd = NO; + shouldAdd = YES; info = [_apts objectAtIndex:i]; partmails = [[info objectForKey:@"partmails"] componentsSeparatedByString:@"\n"]; @@ -111,8 +111,8 @@ static BOOL shouldDisplayWeekend = NO; partstates = [[info objectForKey:@"partstates"] componentsSeparatedByString:@"\n"]; state = [partstates objectAtIndex:p]; - if ([state intValue] != iCalPersonPartStatDeclined) - shouldAdd = YES; + if ([state intValue] == iCalPersonPartStatDeclined) + shouldAdd = NO; break; } } diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index 6b80c214..776e658b 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=139 +SUBMINOR_VERSION:=140 # v0.9.136 requires SOGoUI v0.9.30 # v0.9.123 requires Appointments v0.9.35 -- 2.39.5