[Erp5-report] r42786 nicolas.dumazet - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Mon Jan 31 03:45:22 2011
New Revision: 42786

URL: http://svn.erp5.org?rev=42786&view=rev
Log:
simplify erp5_core specific code

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

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=42786&r1=42785&r2=42786&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Mon Jan 31 03:45:22 2011
@@ -4719,15 +4719,15 @@ Business Template is a set of definition
       generator_class = getattr(site, '_generator_class', ERP5Generator)
       gen = generator_class()
       # update activity tool first if necessary
-      if self.getTitle() == 'erp5_core' and self.getTemplateUpdateTool():
-        gen.setupLastTools(site)
-      if not force:
-        if len(object_to_update) == 0:
+      if self.getTitle() == 'erp5_core':
+        if self.getTemplateUpdateTool():
+          gen.setupLastTools(site)
+        if not force and len(object_to_update) == 0:
           # check if we have to update tools
-          if self.getTitle() == 'erp5_core' and self.getTemplateUpdateTool():
+          if self.getTemplateUpdateTool():
             LOG('Business Template', 0, 'Updating Tools')
             gen.setup(site, 0, update=1)
-          if self.getTitle() == 'erp5_core' and self.getTemplateUpdateBusinessTemplateWorkflow():
+          if self.getTemplateUpdateBusinessTemplateWorkflow():
             LOG('Business Template', 0, 'Updating Business Template Workflows')
             gen.setupWorkflow(site)
           return
@@ -4780,17 +4780,18 @@ Business Template is a set of definition
 
 
       # update tools if necessary
-      if self.getTitle() == 'erp5_core' and self.getTemplateUpdateTool():
-        LOG('Business Template', 0, 'Updating Tools')
-        gen.setup(site, 0, update=1)
-
-      # check if we have to update business template workflow
-      if self.getTitle() == 'erp5_core' and self.getTemplateUpdateBusinessTemplateWorkflow():
-        LOG('Business Template', 0, 'Updating Business Template Workflows')
-        gen.setupWorkflow(site)
-        # XXX keep TM in case update of workflow doesn't work
-        #         self._v_txn = WorkflowUpdateTM()
-        #         self._v_txn.register(update=1, gen=gen, site=site)
+      if self.getTitle() == 'erp5_core':
+        if self.getTemplateUpdateTool():
+          LOG('Business Template', 0, 'Updating Tools')
+          gen.setup(site, 0, update=1)
+
+        # check if we have to update business template workflow
+        if self.getTemplateUpdateBusinessTemplateWorkflow():
+          LOG('Business Template', 0, 'Updating Business Template Workflows')
+          gen.setupWorkflow(site)
+          # XXX keep TM in case update of workflow doesn't work
+          #         self._v_txn = WorkflowUpdateTM()
+          #         self._v_txn.register(update=1, gen=gen, site=site)
 
       # remove trashbin if empty
       if trashbin is not None: