Changeset 8cde5f in indico for indico/MaKaC/conference.py

Timestamp:

04/18/12 16:14:59 (13 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

052e5f

Parents:

f56594 (diff), a00869 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'v0.98-series'

File:

• indico/MaKaC/conference.py (modified) (1 diff)

indico/MaKaC/conference.py

@@ -4323 +4323 @@
         if options.get("alerts",False) :
             for alarm in self.getAlarmList() :
-                # only clone alarms that will happen in the future
-                if alarm.getStartOn() > nowutc():
+                # for absoulte alarms, only clone alarms that will happen in the future
+                if alarm._relative is not None or alarm.getStartOn() > nowutc():
                     # .clone takes care of enqueuing it
                     alarm.clone(conf)