From fa632904e297e68e62813d0d46b2df5249414784 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 13 Jun 2007 19:33:31 +0000 Subject: [PATCH] Monotone-Parent: 20c04b0bdf1f43a5ad91e5871e2205434e862cd6 Monotone-Revision: 6ad4e3d54cbe359d0d7a0e60445f3c30101e2600 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-13T19:33:31 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ UI/Scheduler/GNUmakefile | 1 + UI/Scheduler/UIxCalListingActions.m | 3 +++ 3 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 08fb93e04..022ce2c83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-06-13 Wolfgang Sourdeau + * UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions + -eventsListAction]): sort events from here. + ([UIxCalListingActions -tasksListAction]): sort tasks from here. + * SoObjects/SOGo/NSObject+AptComparison.[hm]: removed category module, replaced with NSArray+Scheduler in UI/SchedulerUI/. diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile index 455d1bd11..b8f79463a 100644 --- a/UI/Scheduler/GNUmakefile +++ b/UI/Scheduler/GNUmakefile @@ -10,6 +10,7 @@ SchedulerUI_LANGUAGES = English French German SchedulerUI_OBJC_FILES = \ SchedulerUIProduct.m \ + NSArray+Scheduler.m \ \ UIxCalMainView.m \ \ diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index d3aa3cac6..d946a13da 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -39,6 +39,7 @@ #import #import "../SOGoUI/SOGoDateFormatter.h" +#import "NSArray+Scheduler.h" #import "UIxCalListingActions.h" @@ -326,6 +327,7 @@ oldEvent = [events nextObject]; } + [newEvents sortUsingSelector: @selector (compareEventsAscending:)]; return [self _responseWithData: newEvents]; } @@ -398,6 +400,7 @@ } task = [tasks nextObject]; } + [filteredTasks sortUsingSelector: @selector (compareTasksAscending:)]; return [self _responseWithData: filteredTasks]; }