Changeset 79b0b7 in indico

Timestamp:

09/29/11 17:27:45 (20 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

663efb

Parents:

ecda80

Message:

[FIX] date/time processing

Location:

indico

Files:

• MaKaC/plugins/Collaboration/EVO/collaboration.py (modified) (1 diff)
• htdocs/js/indico/Collaboration/Collaboration.js (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/EVO/collaboration.py

@@ -271 +271 @@
             self._permissionToStart = True
 
-    def _canBeDeleted(self):
+    def canBeDeleted(self):
         return not (self.isHappeningNow() or self.hasHappened())
 

indico/htdocs/js/indico/Collaboration/Collaboration.js

@@ -178 +178 @@
 
 var formatDateStringCS = function(dateString) {
-    return (dateString.substring(0,10) + ' at ' + dateString.substring(11, 16));
+    var dt = dateString.split(' ')
+    return (dt[0] + ' at ' + dt[1]);
 };