From 6dd9ed0592d8c49ebda567729c20009c6f9ebab8 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 8 Nov 2019 22:17:22 +0100
Subject: [PATCH 1/4] Explicitly instantiate Senaite Site Adapter

---
 bika/lims/exportimport/genericsetup/configure.zcml | 6 +++++-
 bika/lims/exportimport/genericsetup/structure.py   | 8 +++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/bika/lims/exportimport/genericsetup/configure.zcml b/bika/lims/exportimport/genericsetup/configure.zcml
index 0b9f923ed1..1a0fcbb620 100644
--- a/bika/lims/exportimport/genericsetup/configure.zcml
+++ b/bika/lims/exportimport/genericsetup/configure.zcml
@@ -4,7 +4,11 @@
     i18n_domain="senaite.core">
 
   <!-- XML Import/Export Adapters -->
-  <adapter factory=".structure.SenaiteSiteXMLAdapter"/>
+
+  <!-- N.B. Deactivated by purpose!
+            Avoid its usage when the site properties get exported.
+      <adapter factory=".structure.SenaiteSiteXMLAdapter"/>
+  -->
   <adapter factory=".structure.ContentXMLAdapter"/>
 
   <!-- Field Adapters
diff --git a/bika/lims/exportimport/genericsetup/structure.py b/bika/lims/exportimport/genericsetup/structure.py
index 11c5c6a505..5ccc455574 100644
--- a/bika/lims/exportimport/genericsetup/structure.py
+++ b/bika/lims/exportimport/genericsetup/structure.py
@@ -400,7 +400,13 @@ def exportObjects(obj, parent_path, context):
         logger.info("Skipping {}".format(repr(obj)))
         return
 
-    exporter = queryMultiAdapter((obj, context), IBody)
+    if api.is_portal(obj):
+        # explicitly instantiate the exporter to avoid adapter clash of
+        # Products.CMFCore.exportimport.properties.PropertiesXMLAdapter
+        exporter = SenaiteSiteXMLAdapter(obj, context)
+    else:
+        exporter = queryMultiAdapter((obj, context), IBody)
+
     path = "%s%s" % (parent_path, get_id(obj))
     if exporter:
         if exporter.name:

From fa0457e35f9677008759b0996c0c997fbdd3bc65 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 8 Nov 2019 22:23:46 +0100
Subject: [PATCH 2/4] Updated changelog

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 35271afa4d..8bbd9bdb41 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -18,6 +18,7 @@ Changelog
 
 **Fixed**
 
+- #1469 Fix Site Properties Generic Setup Export Step
 - #1467 Cannot override behavior of Batch folder when using `before_render`
 
 

From 1704da67c5f8fef6337f532e4e6f623f0c8af983 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 8 Nov 2019 22:24:52 +0100
Subject: [PATCH 3/4] Better comment

---
 bika/lims/exportimport/genericsetup/configure.zcml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bika/lims/exportimport/genericsetup/configure.zcml b/bika/lims/exportimport/genericsetup/configure.zcml
index 1a0fcbb620..6d97c26ab0 100644
--- a/bika/lims/exportimport/genericsetup/configure.zcml
+++ b/bika/lims/exportimport/genericsetup/configure.zcml
@@ -6,7 +6,8 @@
   <!-- XML Import/Export Adapters -->
 
   <!-- N.B. Deactivated by purpose!
-            Avoid its usage when the site properties get exported.
+            Avoid its usage when the site properties get exported:
+            Products.CMFCore.exportimport.properties.exportSiteProperties
       <adapter factory=".structure.SenaiteSiteXMLAdapter"/>
   -->
   <adapter factory=".structure.ContentXMLAdapter"/>

From b0e286b049c703c41aab759ad8546f99bedb44bb Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 8 Nov 2019 22:29:42 +0100
Subject: [PATCH 4/4] Added upgrade step

---
 bika/lims/upgrade/v01_03_003.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bika/lims/upgrade/v01_03_003.py b/bika/lims/upgrade/v01_03_003.py
index f648c3dc23..37c210f562 100644
--- a/bika/lims/upgrade/v01_03_003.py
+++ b/bika/lims/upgrade/v01_03_003.py
@@ -41,5 +41,10 @@ def upgrade(tool):
 
     logger.info("Upgrading {0}: {1} -> {2}".format(product, ver_from, version))
 
+    # -------- ADD YOUR STUFF BELOW --------
+
+    # https://github.com/senaite/senaite.core/pull/1469
+    setup.runImportStepFromProfile(profile, "propertiestool")
+
     logger.info("{0} upgraded to version {1}".format(product, version))
     return True