Changeset 39e407 in indico

Timestamp:

05/11/12 16:12:45 (12 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

6409e3

Parents:

1d15da

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (05/11/12 16:12:33)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (05/11/12 16:12:45)

Message:

[FIX] Ordering in BTree results

File:

• indico/MaKaC/webinterface/wcomponents.py (modified) (1 diff)

indico/MaKaC/webinterface/wcomponents.py

@@ -3326 +3326 @@
 
         if len(present) < MIN_PRESENT_EVENTS:
-            present = list(index.values(oneMonthTS, thisMonthTS)) + present
+            present = list(index.itervalues(oneMonthTS, thisMonthTS)) + present
 
         if not present:
             maxDT = timezone('UTC').localize(datetime.utcfromtimestamp(index.maxKey())).astimezone(timezone(tz))
             prevMonthTS = utc_timestamp(maxDT.replace(day=1))
-            present = index.values(prevMonthTS)
+            present = list(index.itervalues(prevMonthTS))
         numPast = self._categ.getNumConferences() - len(present) - len(future)
         return present, future, len(future), numPast