From fb7c68d5e5781500cdd6cf7ce04076ed3ef3edc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katja=20S=C3=BCss?= Date: Thu, 27 Jul 2017 11:35:15 +0200 Subject: [PATCH] Make moderation view changes less invasive. --- plone/app/discussion/browser/moderation.pt | 12 +++++++----- plone/app/discussion/profiles/default/catalog.xml | 1 - plone/app/discussion/upgrades.py | 4 ---- plone/app/discussion/upgrades.zcml | 10 ---------- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/plone/app/discussion/browser/moderation.pt b/plone/app/discussion/browser/moderation.pt index b76c98d..24b2fe6 100644 --- a/plone/app/discussion/browser/moderation.pt +++ b/plone/app/discussion/browser/moderation.pt @@ -88,7 +88,8 @@ Name -
Email
+
Email
- + diff --git a/plone/app/discussion/profiles/default/catalog.xml b/plone/app/discussion/profiles/default/catalog.xml index a911f51..3dbd4f9 100644 --- a/plone/app/discussion/profiles/default/catalog.xml +++ b/plone/app/discussion/profiles/default/catalog.xml @@ -14,6 +14,5 @@ - diff --git a/plone/app/discussion/upgrades.py b/plone/app/discussion/upgrades.py index 7db3ebf..8d4083e 100644 --- a/plone/app/discussion/upgrades.py +++ b/plone/app/discussion/upgrades.py @@ -61,7 +61,3 @@ def upgrade_comment_workflows(context): comment.reindexObjectSecurity() except (AttributeError, KeyError): logger.info('Could not reindex comment %s' % brain.getURL()) - - -def update_catalog(context): - context.runImportStepFromProfile(default_profile, 'catalog') diff --git a/plone/app/discussion/upgrades.zcml b/plone/app/discussion/upgrades.zcml index 5b660c4..9fa258c 100644 --- a/plone/app/discussion/upgrades.zcml +++ b/plone/app/discussion/upgrades.zcml @@ -50,15 +50,5 @@ handler=".upgrades.upgrade_comment_workflows" /> - -