Changeset 44d915 in indico

Timestamp:

07/26/11 16:17:58 (22 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

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

Children:

09370c

Parents:

666b92

Message:

[FIX] iterAllConferences

• Otherwise only "leaf" categories would be considered;

Location:

indico

Files:

• MaKaC/conference.py (modified) (1 diff)
• ext/livesync/bistate.py (modified) (1 diff)

indico/MaKaC/conference.py

@@ -1165 +1165 @@
         """
         return self.conferences
+
+    def iterAllConferences( self):
+        """returns the iterator for conferences in all subcategories.
+        """
+        for conf in self.conferences:
+            yield conf
+
+        for subcateg in self.subcategories.itervalues():
+            for conf in subcateg.iterAllConferences():
+                yield conf
 
     def getAllConferenceList( self ):

indico/ext/livesync/bistate.py

@@ -60 +60 @@
         # categories are never converted to records
 
-        for conf in categ.iterConferences():
+        for conf in categ.iterAllConferences():
             cls._breakDownConference(conf, chgSet, state)
             cls._cacheControl(dbi, chgSet)