LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge of '70913882b0f1e07c463bccfd01a69394f02a9ced' 

and '9f4bb6a90906abd5189ebce4675007eb8f89e4a9'

Monotone-Parent: 70913882b0f1e07c463bccfd01a69394f02a9ced
Monotone-Parent: 9f4bb6a90906abd5189ebce4675007eb8f89e4a9
Monotone-Revision: 59d160b60daebebf7589645c180056eb1cc90294

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-10-13T15:10:39
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-10-13 15:10:39 +00:00
parent 3e43e65193 e3e0b7e9e5
commit 9660aeb84e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/Scheduler/UIxCalListingActions.m
View File

@ -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:)];

4
UI/WebServerResources/SchedulerUI.js
View File

@ -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";