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

[nobody at svn.erp5.org]

Author: aurel
Date: Wed Apr  4 09:24:59 2007
New Revision: 13912

URL: http://svn.erp5.org?rev=13912&view=rev
Log:
remove paramater check allowed, instead check if we are in trash tool when content not allowed

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=13912&r1=13911&r2=13912&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Wed Apr  4 09:24:59 2007
@@ -74,7 +74,7 @@
   def newContent(self, id=None, portal_type=None, id_group=None,
           default=None, method=None, immediate_reindex=0,
           container=None, created_by_builder=0, activate_kw=None,
-          is_indexable=None, temp_object=0, check_allowed=1, **kw):
+          is_indexable=None, temp_object=0, **kw):
     """Creates a new content.
     This method is public, since TypeInformation.constructInstance will perform
     the security check.
@@ -103,9 +103,10 @@
         return m(container, new_id)
 
     myType = pt.getTypeInfo(container)
-    if myType is not None and check_allowed == 1:
+    if myType is not None:
       if not myType.allowType( portal_type ):
-        raise ValueError('Disallowed subobject type: %s' % portal_type)
+        if not 'portal_trash' in container.getPath():
+          raise ValueError('Disallowed subobject type: %s' % portal_type)
 
     pt.constructContent( type_name=portal_type,
                          container=container,