Changeset 84c86e in indico

Timestamp:

05/12/10 18:44:29 (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, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

77cb9e

Parents:

27f686

Message:

[FIX] Changed the way start/end date/time works

• checkbox changed from "keep" to "move", since the default was most likely not the most used use case;
• changed the algorithm so that an operation that only changes the end date sets moveEntries to 0;

Location:

indico

Files:

• MaKaC/conference.py (modified) (3 diffs)
• MaKaC/services/implementation/conference.py (modified) (2 diffs)
• htdocs/css/Default.css (modified) (1 diff)
• htdocs/js/indico/Core/Widgets/DateTime.js (modified) (3 diffs)

indico/MaKaC/conference.py

@@ -2806 +2806 @@
         """
 
-        # just store the old values for later
-        oldStartDate = copy.copy(self.getStartDate())
-        oldEndDate = copy.copy(self.getEndDate())
-
+        oldStartDate = self.getStartDate()
+        oldEndDate = self.getEndDate()
 
         # do some checks first
@@ -2820 +2818 @@
             return
 
-        elif moveEntries == 1:
+        # if we reached this point, it means either the start or
+        # the end date (or both) changed
+        # If only the end date was changed, moveEntries = 0
+        if sDate == oldStartDate:
+            moveEntries = 0
+
+        # Pre-check for moveEntries
+        if moveEntries == 1:
             # in case the entries are to be simply shifted
             # we should make sure the interval is big enough
+            # just store the old values for later
+
+            oldInterval = oldEndDate - oldStartDate
             newInterval = eDate - sDate
-            oldInterval = oldEndDate - oldStartDate
 
             if oldInterval > newInterval:
@@ -2830 +2837 @@
                     _("The start/end dates were not changed since the selected "
                       "timespan is not large enough to accomodate the contained "
-                      "timetable entries."),
+                      "timetable entries and spacings."),
                     explanation =
-                    _("You should try using a larger timespan or checking "
-                      "the <em>Don't change session/contribution times...</em> "
-                      "checkbox"))
+                    _("You should try using a larger timespan."))
 
         # so, we really need to try changing something

indico/MaKaC/services/implementation/conference.py

@@ -342 +342 @@
         self._startDate = pm.extract('startDate', pType=datetime.datetime)
         self._endDate = pm.extract('endDate', pType=datetime.datetime)
-        self._keepTimes = pm.extract('keepTimes', pType=bool)
+        self._shiftTimes = pm.extract('shiftTimes', pType=bool)
 
     def _getAnswer(self):
@@ -348 +348 @@
         ContextManager.set('dateChangeNotificationProblems', {})
 
-        if (self._keepTimes):
+        if (self._shiftTimes):
+            moveEntries = 1
+        else:
             moveEntries = 0
-        else:
-            moveEntries = 1
 
         # first sanity check

indico/htdocs/css/Default.css

@@ -6078 +6078 @@
 }
 
-.widgetCheckboxOption strong {
-    font-weight: bold;
-}
 
 .widgetCheckboxOption span {
     vertical-align: middle;
-    font-style: italic;
+    font-size: 12px;
+    color: #555;
     margin-left: 2px;
 }

indico/htdocs/js/indico/Core/Widgets/DateTime.js

@@ -135 +135 @@
          _handleEditMode: function(value) {
 
-             this.keepTimes = Html.checkbox({});
+             this.shiftTimes = Html.checkbox({});
 
              // create datefields
@@ -160 +160 @@
                              this.__buildStructure(this.startDate.draw(), this.endDate.draw()),
                              Html.div("widgetCheckboxOption",
-                                      this.keepTimes,
-                                      Html.unescaped.span({},
-                                      $T("<strong>Don't change</strong> session/contribution times in the timetable"))));
+                                      this.shiftTimes,
+                                      Html.span({},
+                                      $T("Move session/contribution times in the timetable accordingly"))));
          },
 
@@ -177 +177 @@
                      endDate: Util.parseDateTime(this.endDate.get(),
                                                  IndicoDateTimeFormats.Server),
-                     keepTimes: this.keepTimes
+                     shiftTimes: this.shiftTimes
                      };
          },