Changeset 8ad2fb in indico for indico/MaKaC/conference.py

Timestamp:

07/18/11 13:41:21 (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:

5e7b56

Parents:

51d826

Message:

[FIX] Different indexConf(), etc...

File:

• indico/MaKaC/conference.py (modified) (5 diffs)

indico/MaKaC/conference.py

@@ -1092 +1092 @@
 
     def indexConf( self, conf ):
-        calIdx = indexes.IndexesHolder().getIndex('calendar')
-        calIdx.indexConf(conf)
+        # Specific for category changes, calls Conference.indexConf()
+        # (date-related indexes)
         catIdx = indexes.IndexesHolder().getIndex('category')
         catIdx.indexConf(conf)
-        catDateIdx = indexes.IndexesHolder().getIndex('categoryDate')
-        catDateIdx.indexConf(conf)
+        conf.indexConf()
 
     def unindexConf( self, conf ):
-        calIdx = indexes.IndexesHolder().getIndex('calendar')
-        calIdx.unindexConf(conf)
         catIdx = indexes.IndexesHolder().getIndex('category')
         catIdx.unindexConf(conf)
-        catDateIdx = indexes.IndexesHolder().getIndex('categoryDate')
-        catDateIdx.unindexConf(conf)
-
-        Catalog.getIdx('categ_conf_sd').unindex_obj(conf)
+        conf.unindexConf()
 
     def newConference( self, creator, id="", creationDate=None, modificationDate=None ):
@@ -2056 +2050 @@
         self._visibility = 999
         self._pendingQueuesMgr=pendingQueues.ConfPendingQueuesMgr(self)
-#        self.indexConf()
         self._sections = []
         self._participation = Participation(self)
@@ -2435 +2428 @@
 
     def indexConf( self ):
+        # called when event dates change
+        # see also Category.indexConf()
+
         calIdx = indexes.IndexesHolder().getIndex('calendar')
         calIdx.indexConf(self)
@@ -2736 +2732 @@
         return self._observers
 
-    def setDates( self, sDate, eDate=None, check=1, moveEntries=0, creating=False):
+    def setDates( self, sDate, eDate=None, check=1, moveEntries=0):
         """
         Set the start/end date for a conference
@@ -2778 +2774 @@
         # so, we really need to try changing something
 
-        if not creating:
-            # let's get to work and remove the conference from the date indexes
-            self.unindexConf()
+        self.unindexConf()
 
         # set the dates