[Erp5-report] r41649 nicolas - /erp5/trunk/products/ERP5Type/WebDAVSupport.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Wed Dec 22 11:00:56 2010
New Revision: 41649

URL: http://svn.erp5.org?rev=41649&view=rev
Log:
Use only portal_contribution_registry, then follow standart API

Modified:
    erp5/trunk/products/ERP5Type/WebDAVSupport.py

Modified: erp5/trunk/products/ERP5Type/WebDAVSupport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/WebDAVSupport.py?rev=41649&r1=41648&r2=41649&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/WebDAVSupport.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/WebDAVSupport.py [utf8] Wed Dec 22 11:00:56 2010
@@ -213,18 +213,10 @@ class Folder:
     Returns -- Bare and empty object of the appropriate type (or None, if
     we don't know what to do)
     """
-    findPortalTypeName = None
-    registry = getToolByName(self, 'portal_contribution_registry', None)
-    if registry is not None:
-      findPortalTypeName = registry.findPortalTypeName
-    else:
-      # Keep backward compatibility
-      registry = getToolByName(self, 'content_type_registry', None)
-      if registry is None:
-        return None
-      findPortalTypeName = registry.findTypeName
-
-    portal_type = findPortalTypeName(name, typ, body)
+    portal = self.getPortalObject()
+    registry = portal.portal_contribution_registry
+    portal_type = registry.findPortalTypeName(filename=name,
+                                              content_type=typ)
     if portal_type is None:
       return None
 
@@ -234,7 +226,7 @@ class Folder:
     if myType is not None and not myType.allowType( portal_type ) and \
        'portal_contributions' not in self.getPhysicalPath():
       raise ValueError('Disallowed subobject type: %s' % portal_type)
-    container = self.getPortalObject().getDefaultModule(portal_type)
+    container = portal.getDefaultModule(portal_type)
     pt.constructContent(type_name=portal_type,
                         container=container,
                         id=name)