[Erp5-report] r41596 jm - in /erp5/trunk/products/ERP5: ./ Document/

[nobody at svn.erp5.org]

Author: jm
Date: Tue Dec 21 14:48:06 2010
New Revision: 41596

URL: http://svn.erp5.org?rev=41596&view=rev
Log:
Clear activity table unconditionally when a site is created

Tests like testComplexTradeModelLineUseCase were failing without --portal_id=
because a new site was created whereas there were remaining activities from
previously run tests.

Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py
    erp5/trunk/products/ERP5/ERP5Site.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=41596&r1=41595&r2=41596&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Tue Dec 21 14:48:06 2010
@@ -4688,12 +4688,7 @@ Business Template is a set of definition
       gen = generator_class()
       # update activity tool first if necessary
       if self.getTitle() == 'erp5_core' and self.getTemplateUpdateTool():
-        if not site.hasObject('portal_activities'):
-          create_activities = True
-          LOG('Business Template', 0, 'Updating Activity Tool')
-        else:
-          create_activities = False
-        gen.setupLastTools(site, update=1, create_activities=create_activities)
+        gen.setupLastTools(site)
       if not force:
         if len(object_to_update) == 0:
           # check if we have to update tools

Modified: erp5/trunk/products/ERP5/ERP5Site.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/ERP5Site.py?rev=41596&r1=41595&r2=41596&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Site.py [utf8] (original)
+++ erp5/trunk/products/ERP5/ERP5Site.py [utf8] Tue Dec 21 14:48:06 2010
@@ -1573,25 +1573,18 @@ class ERP5Generator(PortalGenerator):
         reindex=reindex, **kw)
     return p
 
-  def setupLastTools(self, p, **kw):
+  def setupLastTools(self, p, create_activities=True, **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
-    if kw.get('create_activities', False):
-      if not p.hasObject('portal_activities'):
-        addTool = p.manage_addProduct['CMFActivity'].manage_addTool
-        addTool('CMF Activity Tool', None) # Allow user to select active/passive
+    if create_activities and not p.hasObject('portal_activities'):
+      addTool = p.manage_addProduct['CMFActivity'].manage_addTool
+      addTool('CMF Activity Tool', None) # Allow user to select active/passive
       # Initialize Activities
-      portal_activities = getToolByName(p, 'portal_activities', None)
-      if portal_activities is not None:
-        if kw.get('update', 0):
-          keep = 1
-        else:
-          keep = 0
-        portal_activities.manageClearActivities(keep=keep)
+      p.portal_activities.manageClearActivities(keep=0)
 
     # Add several other tools, only at the end in order
     # to make sure that they will be reindexed