[Erp5-report] r15228 - /erp5/trunk/products/ERP5/ERP5Site.py

[nobody at svn.erp5.org]

Author: alex
Date: Mon Jul 16 20:06:51 2007
New Revision: 15228

URL: http://svn.erp5.org?rev=15228&view=rev
Log:
If simple method of getDefaultModuleId works, no need to try the more complex
one.

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

Modified: erp5/trunk/products/ERP5/ERP5Site.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/ERP5Site.py?rev=15228&r1=15227&r2=15228&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Site.py (original)
+++ erp5/trunk/products/ERP5/ERP5Site.py Mon Jul 16 20:06:51 2007
@@ -938,16 +938,18 @@
     if portal_object._getOb(expected_module_id, None) is not None:
       module_id = expected_module_id
     expected_module_id += '_module'
-    if portal_object._getOb(expected_module_id, None) is not None:
+    if module is None and portal_object._getOb(expected_module_id, None) \
+        is not None:
       module_id = expected_module_id
     # then look for module where the type is allowed
-    for expected_module_id in portal_object.objectIds(spec=('ERP5 Folder',)):
-      module = portal_object._getOb(expected_module_id, None)
-      if module is not None:
-        if portal_type in self.portal_types[module.getPortalType()].\
-                                  allowed_content_types:
-          module_id = expected_module_id
-          break
+    if module_id is None:
+      for expected_module_id in portal_object.objectIds(spec=('ERP5 Folder',)):
+        module = portal_object._getOb(expected_module_id, None)
+        if module is not None:
+          if portal_type in self.portal_types[module.getPortalType()].\
+                                    allowed_content_types:
+            module_id = expected_module_id
+            break
 
     if module_id is None:
       if default is not MARKER: