[Erp5-report] r45109 rafael - in /erp5/trunk/products/ERP5Configurator: Document/ Tool/

[nobody at svn.erp5.org]

Author: rafael
Date: Tue Apr  5 20:00:14 2011
New Revision: 45109

URL: http://svn.erp5.org?rev=45109&view=rev
Log:
Only mark business configuration installed after the last activity run.

Modified:
    erp5/trunk/products/ERP5Configurator/Document/BusinessConfiguration.py
    erp5/trunk/products/ERP5Configurator/Tool/ConfiguratorTool.py

Modified: erp5/trunk/products/ERP5Configurator/Document/BusinessConfiguration.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Configurator/Document/BusinessConfiguration.py?rev=45109&r1=45108&r2=45109&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Configurator/Document/BusinessConfiguration.py [utf8] (original)
+++ erp5/trunk/products/ERP5Configurator/Document/BusinessConfiguration.py [utf8] Tue Apr  5 20:00:14 2011
@@ -382,7 +382,7 @@ class BusinessConfiguration(Item):
       This is the actual implementation which can be used from workflow 
       actions and Configurator requets
     """
-    kw = dict(tag="start", 
+    kw = dict(tag="start_configuration_%s" % self.getId(), 
               after_method_id=["recursiveImmediateReindexObject",
                                'immediateReindexObject'])
     start = time.time()
@@ -404,6 +404,7 @@ class BusinessConfiguration(Item):
                                                              time.time() - start))
 
     if execute_after_setup_script:
+      kw["tag"] = "final_configuration_step_%s" % self.getId()
       kw["after_method_id"] = ["build", 'immediateReindexObject', \
                                "recursiveImmediateReindexObject"]
 
@@ -412,6 +413,9 @@ class BusinessConfiguration(Item):
           "After setup script called (force) for %s : %s" %
                     (self.getRelativeUrl(), self.getSpecialise()))
 
+    if self.portal_workflow.isTransitionPossible(self, 'install'):
+      self.activate(after_tag=kw["tag"]).install()
+
   security.declareProtected(Permissions.ModifyPortalContent, 'resetBusinessConfiguration')
   def resetBusinessConfiguration(self):
     """ 

Modified: erp5/trunk/products/ERP5Configurator/Tool/ConfiguratorTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Configurator/Tool/ConfiguratorTool.py?rev=45109&r1=45108&r2=45109&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Configurator/Tool/ConfiguratorTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Configurator/Tool/ConfiguratorTool.py [utf8] Tue Apr  5 20:00:14 2011
@@ -481,9 +481,7 @@ class ConfiguratorTool(BaseTool):
       self.REQUEST.set(key, value)
 
     bc = self.restrictedTraverse(business_configuration)
-    # XXX FIXME we just have to build once.
     bc.build()
-    bc.install()
 
     finalize_method = getattr(self, 'ConfiguratorTool_finalizeInstallation', None)
     if finalize_method is not None and callable(finalize_method):