Changeset 0f44e4 in indico

Timestamp:

06/04/10 15:34:04 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

6b71ba

Parents:

30b4d4

Message:

[FIX] Session coordinator timetable display

• the top level timetable was being shown instead (bug introduced by a217dc1f7cb34e7f692e6e077fdcb0e32c875a17);

Location:

indico/MaKaC/webinterface

Files:

• pages/conferences.py (modified) (1 diff)
• pages/sessions.py (modified) (3 diffs)
• tpls/SessionModifSchedule.tpl (modified) (1 diff)

indico/MaKaC/webinterface/pages/conferences.py

@@ -3186 +3186 @@
                self._includeJSPackage('Timetable')
 
+    def _getSchedule(self):
+        return WConfModifScheduleGraphic( self._conf )
+
     def _getTTPage( self, params ):
-        wc = WConfModifScheduleGraphic( self._conf)
+        wc = self._getSchedule()
         return wc.getHTML(params)
 

indico/MaKaC/webinterface/pages/sessions.py

@@ -1472 +1472 @@
 
     def _getSchedule(self):
-        return WSessionModifSchedule(self._session, self._timetable, self._days)
+        return WSessionModifSchedule(self._session)
 
     def _getTabContent( self, params ):
@@ -1479 +1479 @@
 class WSessionModifSchedule(wcomponents.WTemplated):
 
-    def __init__(self, session, timetable, dayList, **params):
+    def __init__(self, session, **params):
         wcomponents.WTemplated.__init__(self, **params)
         self._session = session
-        self._timetable = timetable
-        self._dayList = dayList
 
     def getVars( self ):
@@ -1489 +1487 @@
         tz = self._session.getTimezone()
         vars["timezone"]= tz
-        # the list of days specified by the user through the option box
-        vars["daysParam"] = self._dayList
-        # the list of days from the timetable
-        vars["dayList"]=self._timetable.getDayList()
-        # the first day of the list
-        vars["dayDate"]=self._dayList[0].getDate()
-
-        vars['rbActive'] = info.HelperMaKaCInfo.getMaKaCInfoInstance().getRoomBookingModuleActive()
 
         vars['ttdata'] = simplejson.dumps(schedule.ScheduleToJson.process(self._session.getSchedule(), tz,

indico/MaKaC/webinterface/tpls/SessionModifSchedule.tpl

@@ -18 +18 @@
 IndicoUI.executeOnLoad(function(){
 
-
   $E('timetableDiv').set(timetable.draw());
   timetable.postDraw();