[Erp5-report] r15167 - /erp5/trunk/products/ERP5Type/Core/Folder.py

[nobody at svn.erp5.org]

Author: vincent
Date: Mon Jul  9 10:27:40 2007
New Revision: 15167

URL: http://svn.erp5.org?rev=15167&view=rev
Log:
Fix creation of temp object inside a temp object broken by my previous patch.

Modified:
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=15167&r1=15166&r2=15167&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Mon Jul  9 10:27:40 2007
@@ -94,14 +94,13 @@
       # And made the code more difficult to update
       portal_type = container.allowedContentTypes()[0].id
 
-    if temp_object:
+    # we get an object from factory only for first temp container object
+    # otherwise we get an id so we can use the classic way
+    if temp_object and not getattr(container, 'isTempObject', lambda: 0)():
       from Products.ERP5Type import Document
-      # we get an object from factory only for first temp container object
-      # otherwise we get an id so we can use the classic way
-      if not getattr(container, 'isTempObject', lambda: 0)():
-        factory_name = 'newTemp%s' %(portal_type.replace(' ', ''))
-        m = getattr(Document, factory_name)
-        new_instance = m(container, new_id)
+      factory_name = 'newTemp%s' %(portal_type.replace(' ', ''))
+      m = getattr(Document, factory_name)
+      new_instance = m(container, new_id)
     else:
       myType = pt.getTypeInfo(container)
       if myType is not None and not myType.allowType( portal_type ) and \