ajung/plone.app.discussion
ajung
/
plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move anonymous_email_enabled after anonymous_comments in controlpanel

This commit is contained in:
Philip Bauer 2015-09-13 15:38:46 +02:00
parent 50d9d685ed
commit b7f81fc3fe
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.rst
View File

@ -4,7 +4,8 @@ Changelog
2.4.6 (unreleased) 2.4.6 (unreleased)
------------------ ------------------
- Nothing changed yet. - Move anonymous_email_enabled after anonymous_comments in controlpanel.
[pbauer]
2.4.5 (2015-09-11) 2.4.5 (2015-09-11)

2
plone/app/discussion/browser/javascripts/controlpanel.js
View File

@ -49,6 +49,7 @@ require([ // jshint ignore:line
if (globally_enabled === true) { if (globally_enabled === true) {
$.enableSettings([ $.enableSettings([
$('#formfield-form-widgets-anonymous_comments'), $('#formfield-form-widgets-anonymous_comments'),
$('#formfield-form-widgets-anonymous_email_enabled'),
$('#formfield-form-widgets-moderation_enabled'), $('#formfield-form-widgets-moderation_enabled'),
$('#formfield-form-widgets-edit_comment_enabled'), $('#formfield-form-widgets-edit_comment_enabled'),
$('#formfield-form-widgets-delete_own_comment_enabled'), $('#formfield-form-widgets-delete_own_comment_enabled'),
@ -63,6 +64,7 @@ require([ // jshint ignore:line
else { else {
$.disableSettings([ $.disableSettings([
$('#formfield-form-widgets-anonymous_comments'), $('#formfield-form-widgets-anonymous_comments'),
$('#formfield-form-widgets-anonymous_email_enabled'),
$('#formfield-form-widgets-moderation_enabled'), $('#formfield-form-widgets-moderation_enabled'),
$('#formfield-form-widgets-edit_comment_enabled'), $('#formfield-form-widgets-edit_comment_enabled'),
$('#formfield-form-widgets-delete_own_comment_enabled'), $('#formfield-form-widgets-delete_own_comment_enabled'),

21
plone/app/discussion/interfaces.py
View File

@ -222,6 +222,17 @@ class IDiscussionSettings(Interface):
default=False, default=False,
) )
anonymous_email_enabled = schema.Bool(
title=_(u"label_anonymous_email_enabled",
default=u"Enable anonymous email field"),
description=_(
u"help_anonymous_email_enabled",
default=u"If selected, anonymous user will have to "
u"give their email."),
required=False,
default=False
)
moderation_enabled = schema.Bool( moderation_enabled = schema.Bool(
title=_( title=_(
u"label_moderation_enabled", u"label_moderation_enabled",
@ -344,16 +355,6 @@ class IDiscussionSettings(Interface):
default=False default=False
) )
anonymous_email_enabled = schema.Bool(
title=_(u"label_anonymous_email_enabled",
default=u"Enable anonymous email field"),
description=_(
u"help_anonymous_email_enabled",
default=u"If selected, anonymous user will have to "
u"give their email."),
required=False,
default=False)
class IDiscussionLayer(Interface): class IDiscussionLayer(Interface):
"""Request marker installed via browserlayer.xml. """Request marker installed via browserlayer.xml.