Plone 6 compatibility WIP

Author: laulaz

src/collective/documentgenerator/browser/configure.zcml

@@ -186,14 +186,14 @@
         permission="zope2.View" />
 
     <!-- Override the documentviewer for IConfigurablePODTemplate so it uses ViewConfigurablePodTemplate too -->
-    <configure package="collective.documentviewer" zcml:condition="installed collective.documentviewer">
+    <configure package="collective.documentviewer.browser" zcml:condition="installed collective.documentviewer">
         <browser:page
           name="documentviewer"
           for="collective.documentgenerator.content.pod_template.IConfigurablePODTemplate"
           class="collective.documentgenerator.browser.overrides.DGDXDocumentViewerView"
-          template="templates/documentviewerdx.pt"
+          template="templates/documentviewer.pt"
           permission="zope2.View"
-          layer=".interfaces.ILayer" />
+          layer="..interfaces.ILayer" />
     </configure>
 
     <browser:page

src/collective/documentgenerator/browser/overrides.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 from collective.documentgenerator.browser.views import ViewConfigurablePodTemplate
-from collective.documentviewer.views import DXDocumentViewerView
+from collective.documentviewer.browser.views import DocumentViewerView
 
 
-class DGDXDocumentViewerView(ViewConfigurablePodTemplate, DXDocumentViewerView):
+class DGDXDocumentViewerView(ViewConfigurablePodTemplate, DocumentViewerView):
     """The documentviewer view from collective.documentviewer overrides the default DX
        view, so override it again so our own override is taken into account."""