[Erp5-report] r30822 - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Mon Nov 23 18:13:29 2009
New Revision: 30822

URL: http://svn.erp5.org?rev=30822&view=rev
Log:
simplify generator lookup logic on BusinessTemplates

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=30822&r1=30821&r2=30822&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Mon Nov 23 18:13:29 2009
@@ -5073,12 +5073,9 @@
         self.checkDependencies()
 
       site = self.getPortalObject()
-      custom_generator_class = getattr(site, '_generator_class', None)
-      if custom_generator_class is not None:
-        gen = custom_generator_class()
-      else:
-        from Products.ERP5.ERP5Site import ERP5Generator
-        gen = ERP5Generator()
+      from Products.ERP5.ERP5Site import ERP5Generator
+      generator_class = getattr(site, '_generator_class', ERP5Generator)
+      gen = generator_class()
       # update activity tool first if necessary
       if self.getTitle() == 'erp5_core' and self.getTemplateUpdateTool():
         LOG('Business Template', 0, 'Updating Activity Tool')