From e3e0b7e9e597aa9ac299fdfa474e35ab7a489a2b Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 13 Oct 2010 15:08:41 +0000 Subject: [PATCH] Monotone-Parent: ed9155f6c31847d4a5dcf861ed08dfb9bb7b112a Monotone-Revision: 9f4bb6a90906abd5189ebce4675007eb8f89e4a9 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-10-13T15:08:41 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/UIxCalListingActions.m | 2 +- UI/WebServerResources/SchedulerUI.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index f095a3f9f..a03051469 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -530,7 +530,7 @@ static NSArray *tasksFields = nil; [newEvents sortUsingSelector: @selector (compareEventsEndDateAscending:)]; else if ([sort isEqualToString: @"location"]) [newEvents sortUsingSelector: @selector (compareEventsLocationAscending:)]; - else if ([sort isEqualToString: @"calendar"]) + else if ([sort isEqualToString: @"calendarName"]) [newEvents sortUsingSelector: @selector (compareEventsCalendarNameAscending:)]; else [newEvents sortUsingSelector: @selector (compareEventsStartDateAscending:)]; diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index af88ef125..a00ac1f3a 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -916,7 +916,7 @@ function eventsListCallback(http) { td.appendChild(document.createTextNode(data[i][2])); // calendar } - if (sorting["attribute"] && sorting["attribute"].length > 0) { log ("sort " + sorting["attribute"]); + if (sorting["attribute"] && sorting["attribute"].length > 0) { var sortHeader = $(sorting["attribute"] + "Header"); if (sortHeader) { @@ -1825,7 +1825,7 @@ function onHeaderClick(event) { else if (headerId == "locationHeader") newSortAttribute = "location"; else if (headerId == "calendarNameHeader") - newSortAttribute = "calendar"; + newSortAttribute = "calendarName"; else newSortAttribute = "start";