[Erp5-report] r38660 nicolas.dumazet - in /erp5/trunk/products/ERP5: ./ Tool/

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Mon Sep 27 13:11:23 2010
New Revision: 38660

URL: http://svn.erp5.org?rev=38660&view=rev
Log:
wrong file was committed during r38654, sorry.
Revert 654 and re-commit correct modification

Modified:
    erp5/trunk/products/ERP5/ERP5Site.py
    erp5/trunk/products/ERP5/Tool/TemplateTool.py

Modified: erp5/trunk/products/ERP5/ERP5Site.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/ERP5Site.py?rev=38660&r1=38659&r2=38660&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/ERP5Site.py [utf8] (original)
+++ erp5/trunk/products/ERP5/ERP5Site.py [utf8] Mon Sep 27 13:11:23 2010
@@ -365,7 +365,7 @@ class ERP5Site(FolderMixIn, CMFSite):
     # (e.g. left hand tree frame in {zope root}/manage )
     # we need to set up the site to load portal types inside each site
     setSite(self)
-    return super(FolderMixIn, self).objectValues(*args, **kw)
+    return super(ERP5Site, self).objectValues(*args, **kw)
 
   security.declareProtected(Permissions.AccessContentsInformation, 'searchFolder')
   def searchFolder(self, **kw):

Modified: erp5/trunk/products/ERP5/Tool/TemplateTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/TemplateTool.py?rev=38660&r1=38659&r2=38660&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/TemplateTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Tool/TemplateTool.py [utf8] Mon Sep 27 13:11:23 2010
@@ -476,16 +476,6 @@ class TemplateTool (BaseTool):
           urltype = 'file'
           name = os.path.normpath(url)
 
-      from Products.ERP5Type.Utils import PersistentMigrationMixin
-      # disable dynamic imports of ERP5Type.Document.* documents
-      # into erp5.document new-style classes during import:
-      # reading the XML forces importing the object class, and doing
-      # so will try to access portal_types/<object portal type>, which
-      # will fail since portal types items are not yet imported.
-      # In reality, we can live with old-style objects 'til
-      # install
-      #PersistentMigrationMixin.migrate = 0
-
       if urltype and urltype != 'file':
         if '/portal_templates/asRepository/' in url:
           # In this case, the downloaded BT is already built.
@@ -497,7 +487,6 @@ class TemplateTool (BaseTool):
       else:
         bt = self._download_local(name, id)
 
-      #PersistentMigrationMixin.migrate = 1
       bt.build(no_action=True)
       return bt