[Erp5-report] r11852 - in /erp5/trunk/products/ERP5Type: ./ Tool/

[nobody at svn.erp5.org]

Author: jp
Date: Wed Jan  3 02:50:48 2007
New Revision: 11852

URL: http://svn.erp5.org?rev=11852&view=rev
Log:
Use Core Folder.

Modified:
    erp5/trunk/products/ERP5Type/Tool/BaseTool.py
    erp5/trunk/products/ERP5Type/Tool/ClassTool.py
    erp5/trunk/products/ERP5Type/Utils.py
    erp5/trunk/products/ERP5Type/XMLMatrix.py
    erp5/trunk/products/ERP5Type/XMLObject.py

Modified: erp5/trunk/products/ERP5Type/Tool/BaseTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/BaseTool.py?rev=11852&r1=11851&r2=11852&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/BaseTool.py (original)
+++ erp5/trunk/products/ERP5Type/Tool/BaseTool.py Wed Jan  3 02:50:48 2007
@@ -30,7 +30,7 @@
 
 from AccessControl import ClassSecurityInfo
 from Globals import InitializeClass, DTMLFile
-from Products.ERP5Type.Document.Folder import Folder
+from Products.ERP5Type.Core.Folder import Folder
 from Products.ERP5Type import Permissions, _dtmldir
 
 class BaseTool (UniqueObject, Folder):

Modified: erp5/trunk/products/ERP5Type/Tool/ClassTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Tool/ClassTool.py?rev=11852&r1=11851&r2=11852&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Tool/ClassTool.py (original)
+++ erp5/trunk/products/ERP5Type/Tool/ClassTool.py Wed Jan  3 02:50:48 2007
@@ -39,7 +39,7 @@
 from Products.ERP5Type import Permissions
 from Products.ERP5Type import _dtmldir
 from Products.ERP5Type.Tool.BaseTool import BaseTool
-from Products.ERP5Type.Document.Folder import Folder
+from Products.ERP5Type.Core.Folder import Folder
 
 from Products.ERP5Type.Utils import readLocalPropertySheet, writeLocalPropertySheet, getLocalPropertySheetList
 from Products.ERP5Type.Utils import readLocalExtension, writeLocalExtension, getLocalExtensionList

Modified: erp5/trunk/products/ERP5Type/Utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Utils.py?rev=11852&r1=11851&r2=11852&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Utils.py (original)
+++ erp5/trunk/products/ERP5Type/Utils.py Wed Jan  3 02:50:48 2007
@@ -298,11 +298,17 @@
         if key[0:2] != '__':
           setattr(Permissions, key, getattr(permissions_module, key))
 
+  # Return core document_class list (for ERP5Type only)
+  # this was introduced to permit overriding ERP5Type Document classes
+  # which was not possible when they were define in the Document folder
+  path, core_module_id_list = getModuleIdList(product_path, 'Core')
+  for document in core_module_id_list:
+    InitializeDocument(document, document_path=path)
   # Return document_class list
   path, module_id_list = getModuleIdList(product_path, 'Document')
   for document in module_id_list:
     InitializeDocument(document, document_path=path)
-  return module_id_list
+  return module_id_list + core_module_id_list
 
 #####################################################
 # Modules Import

Modified: erp5/trunk/products/ERP5Type/XMLMatrix.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/XMLMatrix.py?rev=11852&r1=11851&r2=11852&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/XMLMatrix.py (original)
+++ erp5/trunk/products/ERP5Type/XMLMatrix.py Wed Jan  3 02:50:48 2007
@@ -30,7 +30,7 @@
 from Acquisition import aq_base, aq_parent, aq_inner, aq_acquire
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions
-from Products.ERP5Type.Document.Folder import Folder
+from Products.ERP5Type.Core.Folder import Folder
 from Products.ERP5Type.Utils import cartesianProduct
 from Products.ERP5Type.Base import TempBase
 

Modified: erp5/trunk/products/ERP5Type/XMLObject.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/XMLObject.py?rev=11852&r1=11851&r2=11852&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/XMLObject.py (original)
+++ erp5/trunk/products/ERP5Type/XMLObject.py Wed Jan  3 02:50:48 2007
@@ -33,7 +33,7 @@
 from Products.ERP5Type import PropertySheet, Permissions
 from Products.ERP5Type.Utils import convertToUpperCase
 
-from Document.Folder import Folder
+from Core.Folder import Folder
 from zLOG import LOG
 
 class XMLObject( Folder ):