[Erp5-report] r32743 nicolas - in /erp5/trunk/products/ERP5: ./ Document/

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Feb 18 11:01:24 2010
New Revision: 32743

URL: http://svn.erp5.org?rev=32743&view=rev
Log:
Avoid clearing activities if portal_actvities already exists.
This is the responsability of site Manager to recreate Activity SQL Table
if their structure change.
Reviewed by Aurel

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=32743&r1=32742&r2=32743&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Thu Feb 18 11:01:24 2010
@@ -5179,8 +5179,12 @@
       gen = generator_class()
       # update activity tool first if necessary
       if self.getTitle() == 'erp5_core' and self.getTemplateUpdateTool():
-        LOG('Business Template', 0, 'Updating Activity Tool')
-        gen.setupLastTools(site, update=1, create_activities=1)
+        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)
       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=32743&r1=32742&r2=32743&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Site.py [utf8] (original)
+++ erp5/trunk/products/ERP5/ERP5Site.py [utf8] Thu Feb 18 11:01:24 2010
@@ -62,7 +62,7 @@
                        title='ERP5',
                        description='',
                        create_userfolder=1,
-                       create_activities=1,
+                       create_activities=True,
                        email_from_address='postmaster at localhost',
                        email_from_name='Portal Administrator',
                        validate_email=0,
@@ -1432,7 +1432,7 @@
              erp5_sql_deferred_connection_type,
              cmf_activity_sql_connection_type,
              cmf_activity_sql_connection_string,
-             create_activities=1,
+             create_activities=True,
              reindex=1,
              **kw):
     id = str(id)
@@ -1471,7 +1471,7 @@
     make sure that we do not put un the queue the full reindexation
     """
     # Add Activity Tool
-    if kw.has_key('create_activities') and int(kw['create_activities'])==1:
+    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