merge of '8b8f40b39b92d25a5eb1161d5efe0bd91fd3e207'

and 'b5f6c20667d64bf39106ed8fa0eed2bcee16e372'

Monotone-Parent: 8b8f40b39b92d25a5eb1161d5efe0bd91fd3e207
Monotone-Parent: b5f6c20667d64bf39106ed8fa0eed2bcee16e372
Monotone-Revision: e3b893517d5077cf65dad935434fc36e7d8fec29

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-10-10T19:28:05
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -11,6 +11,11 @@
 	the MailFieldNames attribute (an array) specified
 	in every LDAP-based authentication sources.
 
+2007-10-10  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxComponentEditor.m
+	([UIxComponentEditor -componentCalendar]): returns the calendar
+	object of the current event.
 
 2007-10-05  Ludovic Marcotte  <ludovic@inverse.ca>
 
@@ -3658,7 +3663,7 @@
 2006-09-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Contacts/UIxContactView.m: added many wrapper methods to
-	display blocks of data à la Thunderbird Addressbook. If data is
+	display blocks of data à la Thunderbird Addressbook. If data is
 	available, those wrappers (around the NGVCard methods) will
 	enclose the results in a proper HTML output with the correct label
 	(if present), otherwise it will return an empty string.

UI/Scheduler/UIxComponentEditor.m

@@ -365,7 +365,11 @@
 
 - (NSString *) componentCalendar
 {
-  return @"/";
+  SOGoAppointmentFolder *calendar;
+
+  calendar = [[self clientObject] container];
+  
+  return calendar;
 }
 
 /* priorities */

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);