From ebc2d6eb90faa6651e30463be99f8c61e3b31893 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 10 Oct 2007 19:23:58 +0000 Subject: [PATCH 1/2] Monotone-Parent: 4ebf80607b2a71f3b2192bd3ba8c310f15bd37f5 Monotone-Revision: e41de0de8677dc8b5262c513742ba24fe69be861 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-10-10T19:23:58 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/UIxCalUserRightsEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/WebServerResources/UIxCalUserRightsEditor.js b/UI/WebServerResources/UIxCalUserRightsEditor.js index 6ef7e2fd6..174cf154c 100644 --- a/UI/WebServerResources/UIxCalUserRightsEditor.js +++ b/UI/WebServerResources/UIxCalUserRightsEditor.js @@ -3,7 +3,7 @@ function onCancelClick(event) { } function initACLButtons() { - $("cancelButton").addEventListener("click", onCancelClick, false); + Event.observe($("cancelButton"), "click", onCancelClick); } addEvent(window, "load", initACLButtons); From 62e7896e1c979fa3e6ea62b2acd19ae07329e5bc Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 10 Oct 2007 19:25:48 +0000 Subject: [PATCH 2/2] Monotone-Parent: e41de0de8677dc8b5262c513742ba24fe69be861 Monotone-Revision: b5f6c20667d64bf39106ed8fa0eed2bcee16e372 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-10-10T19:25:48 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ UI/Scheduler/UIxComponentEditor.m | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3eb1a972e..15845363d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-10 Francis Lachapelle + + * UI/Scheduler/UIxComponentEditor.m + ([UIxComponentEditor -componentCalendar]): returns the calendar + object of the current event. + 2007-10-05 Ludovic Marcotte * UI/WebServerResources/MailerUI.js diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m index 9046b3229..435d723a8 100644 --- a/UI/Scheduler/UIxComponentEditor.m +++ b/UI/Scheduler/UIxComponentEditor.m @@ -365,7 +365,11 @@ - (NSString *) componentCalendar { - return @"/"; + SOGoAppointmentFolder *calendar; + + calendar = [[self clientObject] container]; + + return calendar; } /* priorities */