make sure that the activity tool is added only at the end

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1986 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/ERP5Site.py

@@ -477,6 +477,17 @@ class ERP5Generator(PortalGenerator):
         self.setup(p, create_userfolder,**kw)
         return p
 
+    def setupLastTools(self, p,**kw):
+        """Set up finals tools
+           We want to set the activity tool only at the end to
+           make sure that we do not put un the queue the full reindexation
+        """
+        # Add Activity Tool
+        LOG('setupTools, kw',0,kw)
+        if kw.has_key('create_activities') and int(kw['create_activities'])==1:
+          addTool = p.manage_addProduct['CMFActivity'].manage_addTool
+          addTool('CMF Activity Tool', None) # Allow user to select active/passive
+
     def setupTools(self, p,**kw):
         """Set up initial tools"""
 
@@ -493,12 +504,6 @@ class ERP5Generator(PortalGenerator):
         addTool('ERP5 Template Tool', None)
         addTool('ERP5 Alarm Tool', None)
 
-        # Add Activity Tool
-        LOG('setupTools, kw',0,kw)
-        if kw.has_key('create_activities') and int(kw['create_activities'])==1:
-          addTool = p.manage_addProduct['CMFActivity'].manage_addTool
-          addTool('CMF Activity Tool', None) # Allow user to select active/passive
-
         # Add ERP5 SQL Catalog Tool
         addTool = p.manage_addProduct['ERP5Catalog'].manage_addTool
         p._delObject('portal_catalog')
@@ -734,6 +739,8 @@ class ERP5Generator(PortalGenerator):
         # XXX for some strange reason, member was indexed 5 times
         self.setupIndex(p)
 
+        self.setupLastTools(p,**kw)
+
     def setupBusinessTemplate(self,p):
         """
         Install the portal_type of Business Template