Changeset 064d40 in indico for indico/MaKaC/webinterface/rh/conferenceModif.py

Timestamp:

10/13/10 17:22:32 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

8eae48

Parents:

ad9a15

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (07/22/10 18:45:14)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (10/13/10 17:22:32)

Message:

[IMP] Several improvements/fixes

• Partial redesign of scheduler code:
  • Non-periodic tasks were not executed if a specific time was added;
  • When the maximum number of tasks in a cycle was exceeded, the current task would be forgotten;
• Switched from threading to multiprocessing;
• Fixed/adapted conference alarms to new classes (mostly);
• Added some base code for an AJAX interface;
• Generalized ListWidget? and derivatives, in order to allow for TableWidgets?, etc...;

File:

• indico/MaKaC/webinterface/rh/conferenceModif.py (modified) (1 diff)

indico/MaKaC/webinterface/rh/conferenceModif.py

@@ -3391 +3391 @@
             self._al.setToAllParticipants(False)
 
-        if self._dateType == "2":
-            self._al.setTimeBefore(timedelta(days=int(self._dayBefore)))
-        elif self._dateType == "3":
-            self._al.setTimeBefore(timedelta(0, int(self._hourBefore)*3600))
-        else:
-            self._al.setStartDate(timezone(self._conf.getTimezone()).localize(datetime(self._year, self._month, self._day, self._hour)).astimezone(timezone('UTC')))
+        if self._dateType == "1":
+            self._al.setStartOn(timezone(self._conf.getTimezone()).localize(datetime(self._year, self._month, self._day, self._hour)).astimezone(timezone('UTC')))
+        else:
+            if self._dateType == "2":
+                delta = timedelta(days=int(self._dayBefore))
+            elif self._dateType == "3":
+                delta = timedelta(0, int(self._hourBefore)*3600)
+            self._al.setStartOn(self._target.getStartDate() - delta)
+
         self._redirect( urlHandlers.UHConfDisplayAlarm.getURL( self._target ) )