From c229e516903215f250c38a8269a41f76308eaecb Mon Sep 17 00:00:00 2001
From: Philip Bauer <bauer@starzel.de>
Date: Thu, 27 Jun 2019 19:59:20 +0200
Subject: [PATCH] add upgrade-step to re-enable comments.js

---
 plone/app/discussion/profiles/default/metadata.xml |  2 +-
 plone/app/discussion/upgrades.py                   |  4 ++++
 plone/app/discussion/upgrades.zcml                 | 11 +++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/plone/app/discussion/profiles/default/metadata.xml b/plone/app/discussion/profiles/default/metadata.xml
index 6557251..c779e86 100644
--- a/plone/app/discussion/profiles/default/metadata.xml
+++ b/plone/app/discussion/profiles/default/metadata.xml
@@ -1,5 +1,5 @@
 <metadata>
- <version>1000</version>
+ <version>1001</version>
  <dependencies>
   <dependency>profile-plone.resource:default</dependency>
   <dependency>profile-plone.app.registry:default</dependency>
diff --git a/plone/app/discussion/upgrades.py b/plone/app/discussion/upgrades.py
index d9114f4..7a0e30c 100644
--- a/plone/app/discussion/upgrades.py
+++ b/plone/app/discussion/upgrades.py
@@ -61,3 +61,7 @@ def upgrade_comment_workflows(context):
             comment.reindexObjectSecurity()
         except (AttributeError, KeyError):
             logger.info('Could not reindex comment {0}'.format(brain.getURL()))
+
+
+def add_js_to_plone_legacy(context):
+    context.runImportStepFromProfile(default_profile, 'plone.app.registry')
diff --git a/plone/app/discussion/upgrades.zcml b/plone/app/discussion/upgrades.zcml
index 9fa258c..02a7e54 100644
--- a/plone/app/discussion/upgrades.zcml
+++ b/plone/app/discussion/upgrades.zcml
@@ -51,4 +51,15 @@
         />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      source="1000"
+      destination="1001"
+      profile="plone.app.discussion:default">
+    <genericsetup:upgradeStep
+        title="Move comment.js into plone-legacy bundle"
+        description=""
+        handler=".upgrades.add_js_to_plone_legacy"
+        />
+  </genericsetup:upgradeSteps>
+
 </configure>