From 583b25530e49f595d5f3d21c7d2917dbbf05d3fe Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Wed, 8 Dec 2010 17:45:11 +0000 Subject: [PATCH] Show "moderate comments" link in the admin panel only if a moderation workflow is enabled for comments. svn path=/plone.app.discussion/trunk/; revision=46206 --- CHANGES.txt | 4 ++++ plone/app/discussion/browser/configure.zcml | 17 +++++++++++++++++ plone/app/discussion/browser/moderation.py | 17 +++++++++++++++++ .../app/discussion/profiles/default/actions.xml | 2 +- 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index d78b8f4..b926068 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,10 @@ Changelog 1.0RC1 (unreleased) ------------------- +- Show "moderate comments" link in the admin panel only if a moderation + workflow is enabled for comments. + [timo] + - Do not allow to change the mail settings in the discussion control panel, if there is no valid mail setup. [timo] diff --git a/plone/app/discussion/browser/configure.zcml b/plone/app/discussion/browser/configure.zcml index 491f294..35c8119 100644 --- a/plone/app/discussion/browser/configure.zcml +++ b/plone/app/discussion/browser/configure.zcml @@ -54,6 +54,23 @@ permission="plone.app.discussion.ReviewComments" /> + + + + + string:${globals_view/navigationRootUrl}/@@moderate-comments - + portal/@@moderate-comments-enabled|nothing