Fix IOSHAContentSkinLayer registration

src/osha/oira/configure.zcml

@@ -28,10 +28,12 @@
 
   <include package="pas.plugins.ldap" />
   <include package="euphorie.deployment" />
+  <include package="plone.restapi" />
   <include package=".client" />
   <include package=".content" />
   <include package=".tiles" />
   <include package=".nuplone" />
+  <include package=".ploneintranet" />
   <include package=".upgrade" />
   <include package=".statistics" />
 
@@ -54,12 +56,6 @@
     name="osha.oira.countries"
     />
 
-  <interface
-      interface=".interfaces.IOSHAContentSkinLayer"
-      type="zope.publisher.interfaces.browser.IBrowserSkinType"
-      name="OiRA"
-      />
-
   <browser:page
       name="outdated-tools-view"
       for="Products.CMFCore.interfaces.ISiteRoot"

src/osha/oira/content/browser/configure.zcml

@@ -54,14 +54,6 @@
       />
 
   <!-- SurveyGroup -->
-  <adapter
-      for="Products.CMFCore.interfaces.IFolderish
-           osha.oira.interfaces.IOSHAContentSkinLayer
-           plone.dexterity.interfaces.IDexterityFTI"
-      provides="zope.publisher.interfaces.browser.IBrowserPage"
-      factory=".surveygroup.AddView"
-      name="euphorie.surveygroup"/>
-
   <configure package="plonetheme.nuplone.skin">
     <browser:page
         name="delete"

src/osha/oira/content/browser/surveygroup.py

@@ -1,17 +1,7 @@
 from Acquisition import aq_parent
 from euphorie.content import MessageFactory as _
-from euphorie.content.browser import surveygroup
 from plone import api
 from plonetheme.nuplone.skin import actions
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-
-
-class AddForm(surveygroup.AddForm):
-    template = ViewPageTemplateFile("templates/surveygroup_add.pt")
-
-
-class AddView(surveygroup.AddView):
-    form = AddForm
 
 
 class Delete(actions.Delete):

src/osha/oira/content/country.py

@@ -1,5 +1,4 @@
 from euphorie.content import MessageFactory as _
-from htmllaundry.z3cform import HtmlText
 from plone.autoform import directives
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.supermodel import model
@@ -9,6 +8,15 @@
 from zope.interface import Invalid
 from zope.interface import invariant
 
+try:
+    # This needs a merge of https://github.com/euphorie/Euphorie/pull/739
+    from euphorie.htmllaundry.z3cform import HtmlText
+except ImportError:
+    # BBB This may not work with lxml 5.2+ (Plone 6.0.11+).
+    # On those versions it needs a merge and release of this PR:
+    # https://github.com/syslabcom/htmllaundry/pull/2
+    from htmllaundry.z3cform import HtmlText
+
 
 class IOSHACountry(model.Schema):
     """Additional fields for the OSHA countries."""

src/osha/oira/interfaces.py

@@ -1,5 +1,5 @@
+from euphorie.content.interfaces import IEuphorieContentLayer
 from osha.oira.nuplone.interfaces import IOiRAFormLayer
-from plonetheme.nuplone.skin.interfaces import NuPloneSkin
 from zope.interface import Interface
 
 
@@ -8,5 +8,5 @@ class IProductLayer(Interface):
     installed."""
 
 
-class IOSHAContentSkinLayer(IOiRAFormLayer, NuPloneSkin):
+class IOSHAContentSkinLayer(IOiRAFormLayer, IEuphorieContentLayer):
     """Marker interface for the CMS/Content editing skin."""

src/osha/oira/ploneintranet/configure.zcml

@@ -0,0 +1,138 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    i18n_domain="euphorie"
+    >
+
+  <include package=".z3cform" />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.country.ICountry"
+      class=".quaive_edit.CountryQuaiveEditForm"
+      template="templates/quaive-edit.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.module.IModule"
+      class=".quaive_edit.ModuleQuaiveEditForm"
+      template="templates/quaive-edit.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.profilequestion.IProfileQuestion"
+      class=".quaive_edit.ProfileQuestionQuaiveEditForm"
+      template="templates/quaive-edit.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.risk.IRisk"
+      class=".quaive_edit.RiskQuaiveEditForm"
+      template="templates/quaive-edit.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.sector.ISector"
+      class=".quaive_edit.SectorQuaiveEditForm"
+      template="templates/quaive-edit.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.solution.ISolution"
+      class=".quaive_edit.SolutionQuaiveEditForm"
+      template="templates/quaive-edit.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.survey.ISurvey"
+      class=".quaive_edit.SurveyQuaiveEditForm"
+      template="templates/quaive-edit.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+
+  <browser:page
+      name="quaive-edit"
+      for="euphorie.content.surveygroup.ISurveyGroup"
+      class=".quaive_edit.SurveyGroupQuaiveEditForm"
+      template="templates/quaive-edit.pt"
+      permission="cmf.ModifyPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.sector"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieSectorView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.country"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieCountryView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.risk"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieRiskView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.surveygroup"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieSurveyGroupView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.survey"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieSurveyView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.module"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieModuleView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="quaive-create-euphorie.solution"
+      for="*"
+      class=".quaive_create.QuaiveCreateEuphorieSolutionView"
+      permission="cmf.AddPortalContent"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+</configure>

src/osha/oira/ploneintranet/interfaces.py

@@ -0,0 +1,5 @@
+from zope.interface import Interface
+
+
+class IQuaiveForm(Interface):
+    """Marker interface for views that are designed to be embedded in Quaive"""