Quaive app merge, part 1

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

@@ -3,6 +3,12 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     >
 
+  <browser:resourceDirectory
+      name="osha.oira.content"
+      directory="resources"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
   <browser:page
       name="manage-ldap-users"
       for="euphorie.content.country.ICountry"
@@ -54,14 +60,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"
@@ -73,6 +71,22 @@
         />
   </configure>
 
+  <browser:page
+      name="survey-group-image"
+      for="euphorie.content.surveygroup.ISurveyGroup"
+      class=".surveygroup.SurveyGroupImage"
+      permission="zope2.View"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
+  <browser:page
+      name="survey-group-introduction"
+      for="euphorie.content.surveygroup.ISurveyGroup"
+      class=".surveygroup.SurveyGroupIntroduction"
+      permission="zope2.View"
+      layer="osha.oira.interfaces.IOSHAContentSkinLayer"
+      />
+
   <!-- Sector -->
   <adapter
       name="euphorie.sector"

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

@@ -1,7 +1,6 @@
 from euphorie.content.browser import sector
 from plone.dexterity.browser.add import DefaultAddForm
 from plone.dexterity.browser.add import DefaultAddView
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 
 
 class AddForm(DefaultAddForm):
@@ -20,12 +19,9 @@ class AddView(DefaultAddView):
 
 
 class EditForm(sector.EditForm):
-    template = ViewPageTemplateFile("templates/sector_edit.pt")
-
-    def extractData(self):
-        unwanted_fields = ("locked", "password", "contact_name", "contact_email")
-        self.fields = self.fields.omit(*unwanted_fields)
-        for key in unwanted_fields:
-            if key in self.widgets:
-                del self.widgets[key]
-        return super().extractData()
+
+    def updateFields(self):
+        super().updateFields()
+        self.fields = self.fields.omit(
+            "title", "login", "locked", "password", "contact_name", "contact_email"
+        )

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

@@ -1,17 +1,9 @@
 from Acquisition import aq_parent
 from euphorie.content import MessageFactory as _
-from euphorie.content.browser import surveygroup
 from plone import api
+from plone.base.utils import base_hasattr
 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
+from Products.Five import BrowserView
 
 
 class Delete(actions.Delete):
@@ -47,3 +39,81 @@ def verify(self, container, context):
             self.request.response.redirect(context.absolute_url())
             return False
         return True
+
+
+class SurveyGroupAttribute(BrowserView):
+    """Base view to return an attribute of a surveygroup from its surveys.
+
+    We want to show both an 'image' and 'introduction' for a survey group,
+    and we can get them from one of its surveys.
+    """
+
+    attribute_name = ""
+
+    @property
+    def surveys(self):
+        """Iterator over the surveys contained in the surveygroup.
+
+        The published survey (if it exists) comes first.
+        """
+        published = self.context.published
+        if published:
+            published_obj = self.context.get(published)
+            if published_obj:
+                yield published_obj
+
+        for obj in self.context.listFolderContents({"portal_type": "Survey"}):
+            if obj.getId() != published:
+                yield obj
+
+    def get_obj_attribute(self, obj):
+        """Return the attribute of the given object."""
+        if not obj:
+            return
+        if not base_hasattr(obj, self.attribute_name):
+            return
+        return getattr(obj, self.attribute_name)
+
+
+class SurveyGroupImage(SurveyGroupAttribute):
+    """Return the image of the surveygroup."""
+
+    attribute_name = "image"
+
+    def __call__(self):
+        """Check all the surveys, if they have an image, redirect to that image.
+
+        The image is set by a cron script,
+        see e.g. https://github.com/syslabcom/scrum/issues/2552.
+
+        This might change in the future.
+
+        Return a fallback if it does not exist.
+        """
+        for survey in self.surveys:
+            if self.get_obj_attribute(survey):
+                image_url = f"{survey.absolute_url()}/@@images/image"
+                return self.request.response.redirect(image_url)
+
+        self.request.response.redirect(
+            f"{api.portal.get().absolute_url()}"
+            f"/++resource++osha.oira.content/clipboard.svg"
+        )
+
+
+class SurveyGroupIntroduction(SurveyGroupAttribute):
+    """Return the introduction of the surveygroup."""
+
+    attribute_name = "introduction"
+
+    def __call__(self):
+        """Check all the surveys, if they have an introduction, show it.
+
+        We only need to return the contents of the field, which is expected
+        to be html.
+        """
+        for survey in self.surveys:
+            value = self.get_obj_attribute(survey)
+            if value:
+                return value
+        return ""