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

move warning messages to code

Browse Source
This commit is contained in:
Stefan Antonelli 2021-02-17 15:46:11 +01:00
parent 8e614828e5
commit 6bbd1aa91a
2 changed files with 14 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plone/app/discussion/browser/controlpanel.pt
View File

@ -9,45 +9,6 @@
<metal:main metal:fill-slot="prefs_configlet_main" i18n:domain="plone">
<div class="statusmessage statusmessage-warning alert alert-warning" role="alert" tal:condition="view/mailhost_warning">
<tal:icon tal:replace="structure python:icons.tag('plone-statusmessage-warning', tag_alt='Warning', tag_class='statusmessage-icon mb-1 me-2')" />
<strong i18n:translate="">Warning</strong>
<span tal:omit-tag="" i18n:translate="text_no_mailhost_configured">
You have not configured a mail host or a site 'From'
address, various features including contact forms, email
notification and password reset will not work. Go to the
<tal:link i18n:name="label_mail_control_panel_link">
<a href=""
i18n:translate="text_no_mailhost_configured_control_panel_link"
tal:attributes="href string:${view/site_url}/@@mail-controlpanel"
>Mail control panel</a>
</tal:link>
to fix this.
</span>
</div>
<div class="statusmessage statusmessage-warning alert alert-warning" role="alert" tal:condition="view/custom_comment_workflow_warning">
<tal:icon tal:replace="structure python:icons.tag('plone-statusmessage-warning', tag_alt='Warning', tag_class='statusmessage-icon mb-1 me-2')" />
<strong i18n:translate="">Warning</strong>
<span tal:omit-tag="" i18n:translate="text_custom_comment_workflow">
You have configured a custom workflow for the 'Discussion Item'
content type. You can enable/disable the comment moderation
in this control panel only if you use one of the default
'Discussion Item' workflows. Go to the
<tal:link i18n:name="label_discussion_control_panel_link">
<a href=""
i18n:translate="text_discussion_type_control_panel_link"
tal:attributes="href string:${view/site_url}/@@content-controlpanel?type_id=Discussion Item"
>Types control panel</a>
</tal:link>
to choose a workflow for the 'Discussion Item' type.
</span>
</div>
<div metal:use-macro="context/global_statusmessage/macros/portal_message">
Portal status message
</div>
<header>
<h1 class="documentFirstHeading" tal:content="view/label">View Title</h1>
<p class="lead" tal:content="view/description">Description</p>

20
plone/app/discussion/browser/controlpanel.py
View File

@ -109,6 +109,11 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
form = DiscussionSettingsEditForm
index = ViewPageTemplateFile('controlpanel.pt')
def __call__(self):
self.mailhost_warning()
self.custom_comment_workflow_warning()
return super(DiscussionSettingsControlPanel, self).__call__()
@property
def site_url(self):
"""Return the absolute URL to the current site, which is likely not
@ -173,8 +178,10 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
mailhost = mail_settings.smtp_host
email = mail_settings.email_from_address
if mailhost and email:
return False
return True
pass
else:
message = _(u'You have not configured a mail host or a site \'From\' address, various features including contact forms, email notification and password reset will not work. Go to the E-Mail Settings to fix this.') # noqa: E501
IStatusMessage(self.request).addStatusMessage(message, 'warning')
def custom_comment_workflow_warning(self):
"""Return True if a custom comment workflow is enabled."""
@ -184,10 +191,11 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
'comment_one_state_workflow' in workflow_chain
comment_review_workflow_enabled = \
'comment_review_workflow' in workflow_chain
if one_state_workflow_enabled \
or comment_review_workflow_enabled:
return
return True
if one_state_workflow_enabled or comment_review_workflow_enabled:
pass
else:
message = _(u'You have configured a custom workflow for the \'Discussion Item\' content type. You can enable/disable the comment moderation in this control panel only if you use one of the default \'Discussion Item\' workflows. Go to the Types control panel to choose a workflow for the \'Discussion Item\' type.') # noqa: E501
IStatusMessage(self.request).addStatusMessage(message, 'warning')
def notify_configuration_changed(event):