From c8788b200ad1e76a17629255435ff937ad89e60c Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 22 Jul 2009 18:41:07 +0000 Subject: [PATCH 1/2] Monotone-Parent: a86e2373112b3d6f47fab17f20db32c0726842b7 Monotone-Revision: f8c415bcf8ada7956979f50f9056a2e8ae867cdb Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-07-22T18:41:07 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxCalListingActions.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index cf486c342..a1feff0af 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -970,8 +970,7 @@ _computeBlocksPosition (NSArray *blocks) forComponentOfType: @"vtodo"] objectEnumerator]; showCompleted = [[request formValueForKey: @"show-completed"] intValue]; - task = [tasks nextObject]; - while (task) + while (task = [tasks nextObject]) { statusCode = [[task objectAtIndex: 2] intValue]; if (statusCode != 1 || showCompleted) @@ -983,7 +982,6 @@ _computeBlocksPosition (NSArray *blocks) [filteredTask addObject: statusFlag]; [filteredTasks addObject: filteredTask]; } - task = [tasks nextObject]; } [filteredTasks sortUsingSelector: @selector (compareTasksAscending:)]; From 975cfe3c1c3c54b162fec78ec20b5731e0e6220a Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 22 Jul 2009 18:47:27 +0000 Subject: [PATCH 2/2] Monotone-Parent: f8c415bcf8ada7956979f50f9056a2e8ae867cdb Monotone-Revision: d5c8f082c4cdd11904c2520fd1a85e71f588fa59 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-07-22T18:47:27 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxCalListingActions.m | 42 ++++++++++++++--------------- UI/Scheduler/product.plist | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index a1feff0af..0cb82659c 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -323,29 +323,29 @@ static NSArray *tasksFields = nil; { if (![component isEqualToString: @"vtodo"] || [currentFolder showCalendarTasks]) { - if ([currentFolder isActive]) - { - currentInfos - = [[currentFolder fetchCoreInfosFrom: startDate - to: endDate - title: title - component: component] objectEnumerator]; + if ([currentFolder isActive]) + { + currentInfos + = [[currentFolder fetchCoreInfosFrom: startDate + to: endDate + title: title + component: component] objectEnumerator]; - while ((newInfo = [currentInfos nextObject])) - { - [newInfo setObject: [currentFolder nameInContainer] - forKey: @"c_folder"]; - [newInfo setObject: [currentFolder ownerInContext: context] - forKey: @"c_owner"]; - if (![[newInfo objectForKey: @"c_title"] length]) + while ((newInfo = [currentInfos nextObject])) + { + [newInfo setObject: [currentFolder nameInContainer] + forKey: @"c_folder"]; + [newInfo setObject: [currentFolder ownerInContext: context] + forKey: @"c_owner"]; + if (![[newInfo objectForKey: @"c_title"] length]) [self _fixComponentTitle: newInfo withType: component]; - // Possible improvement: only call _fixDates if event is recurrent - // or the view range span a daylight saving time change - [self _fixDates: newInfo]; - [infos addObject: [newInfo objectsForKeys: fields - notFoundMarker: marker]]; - } - } + // Possible improvement: only call _fixDates if event is recurrent + // or the view range span a daylight saving time change + [self _fixDates: newInfo]; + [infos addObject: [newInfo objectsForKeys: fields + notFoundMarker: marker]]; + } + } } } diff --git a/UI/Scheduler/product.plist b/UI/Scheduler/product.plist index 7edb33898..a36282868 100644 --- a/UI/Scheduler/product.plist +++ b/UI/Scheduler/product.plist @@ -234,7 +234,7 @@ protectedBy = "ViewAllComponent"; pageName = "UIxTaskEditor"; }; - save = { + save = { protectedBy = "ModifyComponent"; pageName = "UIxTaskEditor"; actionName = "save";