merge of 015eb4cf8ecea01eb6fda8056121a53f54047e09

and b5f6c20667d64bf39106ed8fa0eed2bcee16e372

Monotone-Parent: 015eb4cf8ecea01eb6fda8056121a53f54047e09
Monotone-Parent: b5f6c20667d64bf39106ed8fa0eed2bcee16e372
Monotone-Revision: b0b72d2b8bd2c6a09fcdb1e4950988276473744a

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2007-10-11T15:12:07
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -17,6 +17,11 @@
 	rather use CSS capabilities for proper formatting.
 	This is _WAY_ faster on very large mails.
  
+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>
 

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