Fix Traceback for SENAITE Setup during installation (senaite#2064)

Author: ramonski

src/bika/lims/content/bikasetup.py

@@ -989,13 +989,17 @@ def getEmailBodySamplePublication(self):
         """Get the value from the senaite setup
         """
         setup = api.get_senaite_setup()
-        return setup.getEmailBodySamplePublication()
+        # setup is `None` during initial site content structure installation
+        if setup:
+            return setup.getEmailBodySamplePublication()
 
     def setEmailBodySamplePublication(self, value):
         """Set the value in the senaite setup
         """
         setup = api.get_senaite_setup()
-        setup.setEmailBodySamplePublication(value)
+        # setup is `None` during initial site content structure installation
+        if setup:
+            setup.setEmailBodySamplePublication(value)
 
 
 registerType(BikaSetup, PROJECTNAME)

src/senaite/core/setuphandlers.py

@@ -172,9 +172,6 @@ def install(context):
     logger.info("SENAITE CORE install handler [BEGIN]")
     portal = context.getSite()
 
-    # Used in bika_setup, therefore it has to be added here
-    add_senaite_setup(portal)
-
     # Run required import steps
     _run_import_step(portal, "skins")
     _run_import_step(portal, "browserlayer")
@@ -200,6 +197,7 @@ def install(context):
     setup_catalog_mappings(portal)
     setup_auditlog_catalog_mappings(portal)
     setup_content_structure(portal)
+    add_senaite_setup(portal)
     add_dexterity_portal_items(portal)
     add_dexterity_setup_items(portal)