Changeset a5c240 in indico

Timestamp:

02/18/11 15:43:47 (2 years 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:

4376e4

Parents:

9f7b3f6

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (02/18/11 09:31:45)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/18/11 15:43:47)

Message:

[FIX] Small details

• livesync - small detail
• Issues caused by migration
• Missing 'edit_16' icon
• Fix retried requests

Files:

• bin/migration/migrate_0.97_0.98.py (modified) (3 diffs)
• indico/MaKaC/webinterface/rh/base.py (modified) (1 diff)
• indico/ext/livesync/cern_search/agent.py (modified) (1 diff)
• indico/htdocs/images/edit_16.png (added)
• indico/modules/upcoming.py (modified) (1 diff)

bin/migration/migrate_0.97_0.98.py

@@ -145 +145 @@
         """bin/migration/CategoryDate.py"""
 
+
 def runCategoryConfDictToTreeSet(dbi):
     """
@@ -155 +156 @@
             print categ.getId()
 
+
 def runMigration():
-    tasks = [runPluginMigration, runTaskMigration,
-             runConferenceMigration, migrateCategoryDateIndex,
+    tasks = [runPluginMigration,
+             runTaskMigration,
+             runConferenceMigration,
+             runCategoryDateIndexMigration,
              runCategoryConfDictToTreeSet]
 
@@ -174 +178 @@
     print console.colored("Database Migration successful!\n",
                           'green', attrs=['bold'])
+
 
 def main():

indico/MaKaC/webinterface/rh/base.py

@@ -466 +466 @@
                 if retry < 10:
                     # notify components that the request is being retried
-                    self._notify('requestRetry', 10-retry)
+                    self._notify('requestRetry', self._req, 10-retry)
 
                 try:

indico/ext/livesync/cern_search/agent.py

@@ -120 +120 @@
         tupload = time.time() - (tstart + tgen)
 
-        self._logger.info('rec %s result: %s' % (batch, result_data))
+        self._logger.debug('rec %s result: %s' % (batch, result_data))
 
         xmlDoc = etree.fromstring(result_data)

indico/modules/upcoming.py

@@ -224 +224 @@
                     wrappedObj.getId(),
                     date, date + obj.getAdvertisingDelta())
-                for confId in events:
-                    conf = conference.ConferenceHolder().getById(confId)
+                for conf in events:
                     self.processEvent(date, conf, obj, objDict)