# HG changeset patch
# User Katia Saurfelt <katia.saurfelt@logilab.fr>
# Date 1330610458 -3600
# Node ID d07dadd8f6649673535f23de77048ff377fa73b2
# Parent  c17d855bd95bcd9d79551708b7ba410d141cd8ff
fix events display in calendar (closes #2167866)

diff -r c17d855bd95b -r d07dadd8f664 web/views/calendar.py
--- a/web/views/calendar.py	Thu Mar 01 14:32:42 2012 +0100
+++ b/web/views/calendar.py	Thu Mar 01 15:00:58 2012 +0100
@@ -197,6 +197,8 @@
         self.w(u'<div id="%s"></div>' % self.calendar_id)
 
     def add_onload(self):
+        fullcalendar_options = self.fullcalendar_options.copy()
+        fullcalendar_options['events'] = self.get_events()
         # i18n
         self._cw.add_js('fullcalendar.locale.js')
         # js callback to add a tooltip and to put html in event's title
@@ -211,8 +213,7 @@
         };
         $("#%s").fullCalendar(options);
         """ #"
-        self._cw.add_onload(js % (self._cw.lang, json_dumps(self.fullcalendar_options), self.calendar_id))
-
+        self._cw.add_onload(js % (self._cw.lang, json_dumps(fullcalendar_options), self.calendar_id))
 
     def get_events(self):
         events = []