Changeset 7de667 in indico

Timestamp:

02/22/12 11:57:30 (15 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, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

46fff4

Parents:

b86ac2

git-author:

Matthew Pugh <matthew.alexander.pugh@…> (02/22/12 09:14:04)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (02/22/12 11:57:30)

Message:

[MIN] VSO skip time parsing if not available.

• If no startDate parameter is present, returns nothing else parses.
• Closes #992

Location:

indico/MaKaC

Files:

• plugins/Collaboration/indexes.py (modified) (1 diff)
• webinterface/tpls/AdminCollaboration.tpl (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/indexes.py

@@ -59 +59 @@
 
         reverse = orderBy == "descending"
-
         try:
             index = self.getIndex(indexName)

indico/MaKaC/webinterface/tpls/AdminCollaboration.tpl

@@ -494 +494 @@
         time = booking.modificationDate.time.substring(0,5);
     } else if (viewBy === "startDate" || viewBy === "conferenceStartDate") {
-        time = Util.parseDateTime(booking.bookingParams.startDate, IndicoDateTimeFormats.Default).time.substring(0, 5);
+        time = (booking.bookingParams.startDate.length === 0)
+               ? '' : Util.parseDateTime(booking.bookingParams.startDate,
+                       IndicoDateTimeFormats.Default).time.substring(0, 5);
     }