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

applied comments

pull/41/head
Alexandre Cloutier 2014-06-26 16:42:05 -04:00
parent de2ee2322a
commit 7a69bc46eb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SoObjects/Appointments/SOGoAppointmentFolder.m
View File

@ -3282,7 +3282,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
to: nil
title: nil
component: @"vtodo"
additionalFilters: @"c_status != 2 AND c_status != 3"];
additionalFilters: @"c_status != 1 AND c_status != 3"];
activeTasks = [NSNumber numberWithInt:[tasksList count]];

2
UI/Scheduler/UIxCalendarSelector.m
View File

@ -121,8 +121,6 @@ _intValueFromHex (NSString *hexString)
[calendar setObject: [folder ownerInContext: context]
forKey: @"owner"];
fActiveTasks = [folder activeTasks];
if (fActiveTasks == nil)
fActiveTasks = 0;
[calendar setObject:fActiveTasks forKey:@"activeTasks" ];
[calendars addObject: calendar];
}

8
UI/WebServerResources/SchedulerUI.js
View File

@ -2915,7 +2915,13 @@ function initCalendarSelector() {
var input = items[i].childNodesWithTag("input")[0];
var activeTasks = items[i].childNodesWithTag("span")[0];
$(input).observe("click", clickEventWrapper(updateCalendarStatus));
$(activeTasks).innerHTML = "(" + activeTasks.innerText + ")";
if (activeTasks.textContent == "0") {
activeTasks.innerHTML = "";
}
else {
activeTasks.innerHTML = "(" + activeTasks.innerText + ")";
}
}
var links = $("calendarSelectorButtons").childNodesWithTag("a");