From 7d817dcb9b36526bfa9db26c93bc19fc8bea9efe Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 19 Mar 2009 16:49:36 +0000 Subject: [PATCH 1/3] See ChangeLog Monotone-Parent: b11b40d1a73231b76eb4bb1ce04046646f40d52f Monotone-Revision: dd31e8f881d1c923d951b3c5ddf9a90c986c2165 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-03-19T16:49:36 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ UI/Scheduler/UIxCalListingActions.m | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0cf2a9e1..5f21d811f 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/SOGoUser.m ([SOGoUser 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]; } From 75bcbf8e5cf4ec124fa128d06a4d56d426b89beb Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 19 Mar 2009 17:59:20 +0000 Subject: [PATCH 2/3] Monotone-Parent: dd31e8f881d1c923d951b3c5ddf9a90c986c2165 Monotone-Revision: a1f761bf97ae1835eab590dcfd609d788cbf7d1f Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-03-19T17:59:20 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SOGoRootPage.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js index 7c60d2cae..547bf11ea 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); From ed597858623a9dd1f523545708f47a912147399e Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 19 Mar 2009 18:04:23 +0000 Subject: [PATCH 3/3] Monotone-Parent: a1f761bf97ae1835eab590dcfd609d788cbf7d1f Monotone-Revision: 8dcf465d8b7d8d1213dcce13303ce7aba65a10ff Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2009-03-19T18:04:23 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/SOGoRootPage.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/UI/WebServerResources/SOGoRootPage.js b/UI/WebServerResources/SOGoRootPage.js index 547bf11ea..2c6f1200f 100644 --- a/UI/WebServerResources/SOGoRootPage.js +++ b/UI/WebServerResources/SOGoRootPage.js @@ -28,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(); @@ -39,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" });