[Erp5-report] r21596 - in /erp5/trunk/products: ERP5/Document/ ERP5/bootstrap/erp5_core/Por...

[nobody at svn.erp5.org]

Author: jm
Date: Fri Jun 13 17:34:42 2008
New Revision: 21596

URL: http://svn.erp5.org?rev=21596&view=rev
Log:
temp objects:
 * drop filter_content_types parameter of Folder.newContent
 * revert previous patch to ERP5/Document/Domain.py
 * add 'Domain Generator' to allowed content types of 'Base Domain'

Modified:
    erp5/trunk/products/ERP5/Document/Domain.py
    erp5/trunk/products/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5/Document/Domain.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Domain.py?rev=21596&r1=21595&r2=21596&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Domain.py (original)
+++ erp5/trunk/products/ERP5/Document/Domain.py Fri Jun 13 17:34:42 2008
@@ -108,8 +108,7 @@
     We need a way to know how deep we are in the domain generation
     to prevent infinite recursion XXX not implemented
     """
-    klass = tmp_domain_generator = self.newContent(
-      portal_type='Domain Generator', temp_object=1, filter_content_types=0)
+    klass = tmp_domain_generator = self.newContent(portal_type='Domain Generator', temp_object=1)
     script = self.getDomainGeneratorMethodId('')
     return tmp_domain_generator.getDomainGeneratorList(depth=depth, klass=klass, script=script, parent=self)
 
@@ -118,8 +117,7 @@
     """
     We generate temp domain here because we must set an aquisition wrapper
     """
-    domain = self.newContent(id=id, portal_type='Domain',
-                             temp_object=1, filter_content_types=0)
+    domain = self.newContent(id=id, portal_type='Domain', temp_object=1)
     return domain.__of__(self)
 
   def getChildDomainValueList(self, parent = None, **kw):

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml?rev=21596&r1=21595&r2=21596&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/PortalTypeAllowedContentTypeTemplateItem/allowed_content_types.xml Fri Jun 13 17:34:42 2008
@@ -10,6 +10,7 @@
  </portal_type>
  <portal_type id="Base Domain">
   <item>Domain</item>
+  <item>Domain Generator</item>
  </portal_type>
  <portal_type id="Cache Factory">
   <item>Ram Cache</item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=21596&r1=21595&r2=21596&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Fri Jun 13 17:34:42 2008
@@ -1,1 +1,1 @@
-847
+848

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list?rev=21596&r1=21595&r2=21596&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/template_portal_type_allowed_content_type_list Fri Jun 13 17:34:42 2008
@@ -2,6 +2,7 @@
 Applied Rule | Simulation Movement
 Base Category | Category
 Base Domain | Domain
+Base Domain | Domain Generator
 Cache Factory | Distributed Ram Cache
 Cache Factory | Ram Cache
 Cache Factory | SQL Cache

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=21596&r1=21595&r2=21596&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Fri Jun 13 17:34:42 2008
@@ -111,8 +111,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, reindex_kw=None,
-          filter_content_types=1, **kw):
+          is_indexable=None, temp_object=0, reindex_kw=None, **kw):
     """Creates a new content.
     This method is public, since TypeInformation.constructInstance will perform
     the security check.
@@ -135,7 +134,7 @@
       # XXX This feature is very confusing
       # And made the code more difficult to update
       portal_type = container.allowedContentTypes()[0].id
-    elif filter_content_types:
+    else:
       type_info = pt.getTypeInfo(container)
       if type_info is not None and not type_info.allowType(portal_type) and \
           'portal_trash' not in container.getPhysicalPath():