diff --git a/ChangeLog b/ChangeLog index c7e6b491a..34cc498a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-03-19 Francis Lachapelle + + * UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions + -_fetchFields:forComponentOfType:]): the _fixDates method doesn't + have to be called for the month view. + 2009-03-19 Wolfgang Sourdeau * SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index f7b364c4e..85ed4e5d3 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -327,9 +327,10 @@ static NSArray *tasksFields = nil; 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]; + if (dayBasedView) + // 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]]; } @@ -800,8 +801,7 @@ _computeBlocksPosition (NSArray *blocks) event = [events objectAtIndex: count]; eventNbr = [NSNumber numberWithUnsignedInt: count]; if (dayBasedView && [[event objectAtIndex: 7] boolValue]) - [self _fillBlocks: allDayBlocks - withEvent: event withNumber: eventNbr]; + [self _fillBlocks: allDayBlocks withEvent: event withNumber: eventNbr]; else [self _fillBlocks: blocks withEvent: event withNumber: eventNbr]; } diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js index 7c60d2cae..2c6f1200f 100644 --- a/UI/WebServerResources/SOGoRootPage.js +++ b/UI/WebServerResources/SOGoRootPage.js @@ -7,10 +7,12 @@ function initLogin() { + "; expires=" + date.toGMTString()); var about = $("about"); - about.observe("click", function(event) { $("aboutBox").show(); }); + if (about) { + about.observe("click", function(event) { $("aboutBox").show(); }); - var aboutClose = $("aboutClose"); - aboutClose.observe("click", function(event) { $("aboutBox").hide(); }); + var aboutClose = $("aboutClose"); + aboutClose.observe("click", function(event) { $("aboutBox").hide(); }); + } var submit = $("submit"); submit.observe("click", onLoginClick); @@ -26,7 +28,7 @@ function onLoginClick(event) { var userNameField = $("userName"); var userName = userNameField.value; var password = $("password").value; - var language = $("language").value; + var language = $("language"); if (userName.length > 0) { this.hide(); @@ -37,11 +39,12 @@ function onLoginClick(event) { && !userName.endsWith(loginSuffix)) userName += loginSuffix; var url = $("connectForm").getAttribute("action"); - var parameters = ("userName=" + encodeURIComponent(userName) + - "&password=" + encodeURIComponent(password) + - ((language == "WONoSelectionString")?"":("&language=" + language))); + var parameters = "userName=" + encodeURIComponent(userName) + + "&password=" + encodeURIComponent(password); + if (language) + parameters += (language.value == "WONoSelectionString")?"":("&language=" + language.value); document.cookie = ""; - triggerAjaxRequest(url, onLoginCallback, null, parameters, + triggerAjaxRequest(url, onLoginCallback, null, (parameters), { "Content-type": "application/x-www-form-urlencoded", "Content-length": parameters.length, "Connection": "close" });