ZODB Components: Migrate {Base,Document}ExtensibleTraversableMixin from filesystem.

6d29bc63 · Arnaud Fontaine · 30f6a357 · 6d29bc63 · 6d29bc63 · 6d29bc63
Commit 6d29bc63 authored Jul 28, 2020 by Arnaud Fontaine
10 changed files
--- a/bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.WebSection.py
+++ b/bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.WebSection.py
@@ -30,7 +30,7 @@
 from AccessControl import ClassSecurityInfo
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5.Document.Domain import Domain
-from Products.ERP5.mixin.document_extensible_traversable import DocumentExtensibleTraversableMixin
+from erp5.component.mixin.DocumentExtensibleTraversableMixin import DocumentExtensibleTraversableMixin
 from Acquisition import aq_base, aq_inner
 from Products.ERP5Type.UnrestrictedMethod import unrestricted_apply
 from AccessControl import Unauthorized

--- a/bt5/erp5_base/MixinTemplateItem/portal_components/mixin.erp5.OOoDocumentExtensibleTraversableMixin.py
+++ b/bt5/erp5_base/MixinTemplateItem/portal_components/mixin.erp5.OOoDocumentExtensibleTraversableMixin.py
@@ -31,8 +31,8 @@ from AccessControl.SecurityManagement import setSecurityManager
 from Products.CMFCore.utils import _checkConditionalGET, _setCacheHeaders, _ViewEmulator
 from OFS.Image import File as OFSFile
 from erp5.component.document.Document import ConversionError, NotConvertedError
-from Products.ERP5.mixin.base_extensible_traversable import BaseExtensibleTraversableMixin
-from Products.ERP5.mixin.document_extensible_traversable import DocumentExtensibleTraversableMixin
+from erp5.component.mixin.BaseExtensibleTraversableMixin import BaseExtensibleTraversableMixin
+from erp5.component.mixin.DocumentExtensibleTraversableMixin import DocumentExtensibleTraversableMixin

 # XXX: these duplicate ones in ERP5.Document
 EMBEDDED_FORMAT = '_embedded'

--- a/bt5/erp5_oauth/ToolComponentTemplateItem/portal_components/tool.erp5.OAuthTool.py
+++ b/bt5/erp5_oauth/ToolComponentTemplateItem/portal_components/tool.erp5.OAuthTool.py
@@ -64,7 +64,7 @@ class OAuthTool(BaseTool):
 InitializeClass(OAuthTool)

 import sys
-sys.modules['Products.ERP5TioSafe.Tool.OAuthTool'] = sys.modules[__name__]
+sys.modules['erp5.component.tool.OAuthTool'] = sys.modules[__name__]
 class DummyClassForUnpickle(object):
  def __init__(self, *_, **__):
    pass

--- a/bt5/erp5_web/DocumentTemplateItem/portal_components/document.erp5.StaticWebSection.py
+++ b/bt5/erp5_web/DocumentTemplateItem/portal_components/document.erp5.StaticWebSection.py
@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo
 from Acquisition import aq_base
 from OFS.Traversable import NotFound

-from Products.ERP5.mixin.document_extensible_traversable import DocumentExtensibleTraversableMixin
+from erp5.component.mixin.DocumentExtensibleTraversableMixin import DocumentExtensibleTraversableMixin
 from erp5.component.document.WebSection import WebSection
 from Products.ERP5Type import Permissions


--- a/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Document.py
+++ b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.Document.py
@@ -208,7 +208,7 @@ class DocumentConversionServerProxy():
  def __getattr__(self, attr):
    return partial(self._proxy_function, attr)

-from Products.ERP5.mixin.document_extensible_traversable import DocumentExtensibleTraversableMixin
+from erp5.component.mixin.DocumentExtensibleTraversableMixin import DocumentExtensibleTraversableMixin
 from erp5.component.interface.IConvertable import IConvertable
 from erp5.component.interface.ITextConvertable import ITextConvertable
 from erp5.component.interface.IHtmlConvertable import IHtmlConvertable

--- a/product/ERP5/mixin/base_extensible_traversable.py
+++ b/product/ERP5/mixin/base_extensible_traversable.py
@@ -32,7 +32,7 @@ from base64 import decodestring

 from zLOG import LOG
 from AccessControl import ClassSecurityInfo, getSecurityManager
-from AccessControl.SecurityManagement import newSecurityManager, setSecurityManager
+from AccessControl.SecurityManagement import newSecurityManager
 from Products.CMFCore.utils import getToolByName

 from Products.ERP5Type.ExtensibleTraversable import ExtensibleTraversableMixIn
@@ -117,7 +117,7 @@ class BaseExtensibleTraversableMixin(ExtensibleTraversableMixIn):
                # The same here as above. unrestrictedTraverse provides
                # just a plain dict, so request.other does not exist.
                del request['PUBLISHED']
-          except:
+          except Exception:
            LOG("ERP5 WARNING",0,
                "Failed to retrieve user in __bobo_traverse__ of WebSection %s" % self.getPath(),
                error=True)

--- a/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.BaseExtensibleTraversableMixin.xml
+++ b/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.BaseExtensibleTraversableMixin.xml
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Mixin Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>BaseExtensibleTraversableMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.mixin.base_extensible_traversable</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>mixin.erp5.BaseExtensibleTraversableMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Mixin Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
--- a/product/ERP5/mixin/document_extensible_traversable.py
+++ b/product/ERP5/mixin/document_extensible_traversable.py
@@ -30,7 +30,7 @@
 from Acquisition import aq_base
 from AccessControl import Unauthorized
 from AccessControl.SecurityManagement import setSecurityManager
-from Products.ERP5.mixin.base_extensible_traversable import BaseExtensibleTraversableMixin
+from erp5.component.mixin.BaseExtensibleTraversableMixin import BaseExtensibleTraversableMixin
 from Products.ERP5Type.UnrestrictedMethod import unrestricted_apply

 class DocumentExtensibleTraversableMixin(BaseExtensibleTraversableMixin):

--- a/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.DocumentExtensibleTraversableMixin.xml
+++ b/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.DocumentExtensibleTraversableMixin.xml
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Mixin Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>DocumentExtensibleTraversableMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5.mixin.document_extensible_traversable</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>mixin.erp5.DocumentExtensibleTraversableMixin</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Mixin Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
--- a/product/ERP5/bootstrap/erp5_core/bt/template_mixin_id_list
+++ b/product/ERP5/bootstrap/erp5_core/bt/template_mixin_id_list
 mixin.erp5.AmountGeneratorMixin
 mixin.erp5.BaseConvertableFileMixin
+mixin.erp5.BaseExtensibleTraversableMixin
 mixin.erp5.CachedConvertableMixin
 mixin.erp5.CompositionMixin
 mixin.erp5.CrawlableMixin
 mixin.erp5.DiscoverableMixin
+mixin.erp5.DocumentExtensibleTraversableMixin
 mixin.erp5.DocumentMixin
 mixin.erp5.DocumentProxyMixin
 mixin.erp5.DownloadableMixin