Changeset 195085 in indico for indico/MaKaC/conference.py

Timestamp:

11/22/11 16:36:01 (18 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

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

Children:

75eb7c5, cf0996

Parents:

dcdf89

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (11/02/11 16:35:56)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (11/22/11 16:36:01)

Message:

[IMP] Event rescheduling: more intelligent check

• when verifying if the event can be changed with rescheduling entries, do not simply check if the interval became shorter but actually check if the entries are going to fit

File:

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

indico/MaKaC/conference.py

@@ -2761 +2761 @@
             newInterval = eDate - sDate
 
-            if oldInterval > newInterval:
-                raise TimingError(
-                    _("The start/end dates were not changed since the selected "
-                      "timespan is not large enough to accomodate the contained "
-                      "timetable entries and spacings."),
-                    explanation =
-                    _("You should try using a larger timespan."))
+            entries = self.getSchedule().getEntries()
+            if oldInterval > newInterval and entries:
+                eventInterval = entries[-1].getEndDate() - entries[0].getStartDate()
+                diff = entries[0].getStartDate() - oldStartDate
+                if sDate + diff + eventInterval > eDate:
+                    raise TimingError(
+                        _("The start/end dates were not changed since the selected "
+                          "timespan is not large enough to accomodate the contained "
+                          "timetable entries and spacings."),
+                        explanation=_("You should try using a larger timespan."))
 
         # so, we really need to try changing something