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

Fix some easy pep8 issues

Browse Source
This commit is contained in:
Daniel Jowett 2017-01-24 10:58:39 +00:00
parent 6547486fd8
commit d2bba1d5ea
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.rst
View File

@ -20,6 +20,9 @@ Bug fixes:
- Improve English on a couple of field descriptions - Improve English on a couple of field descriptions
[djowett] [djowett]
- Fix some easy pep8 issues
[djowett]
2.4.19 (2017-01-02) 2.4.19 (2017-01-02)
------------------- -------------------

2
plone/app/discussion/browser/captcha.py
View File

@ -65,3 +65,5 @@ class CaptchaExtender(extensible.FormExtender):
self.form.fields['captcha'].widgetFactory = NorobotsFieldWidget self.form.fields['captcha'].widgetFactory = NorobotsFieldWidget
else: else:
self.form.fields['captcha'].mode = interfaces.HIDDEN_MODE self.form.fields['captcha'].mode = interfaces.HIDDEN_MODE

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

@ -125,7 +125,8 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
output.append('globally_enabled') output.append('globally_enabled')
# Comment moderation # Comment moderation
one_state_worklow_disabled = 'comment_one_state_workflow' not in workflow_chain one_state_worklow_disabled = \
'comment_one_state_workflow' not in workflow_chain
comment_review_workflow_disabled = \ comment_review_workflow_disabled = \
'comment_review_workflow' not in workflow_chain 'comment_review_workflow' not in workflow_chain
if one_state_worklow_disabled and comment_review_workflow_disabled: if one_state_worklow_disabled and comment_review_workflow_disabled:
@ -174,7 +175,8 @@ class DiscussionSettingsControlPanel(controlpanel.ControlPanelFormWrapper):
""" """
wftool = getToolByName(self.context, 'portal_workflow', None) wftool = getToolByName(self.context, 'portal_workflow', None)
workflow_chain = wftool.getChainForPortalType('Discussion Item') workflow_chain = wftool.getChainForPortalType('Discussion Item')
one_state_workflow_enabled = 'comment_one_state_workflow' in workflow_chain one_state_workflow_enabled = \
'comment_one_state_workflow' in workflow_chain
comment_review_workflow_enabled = \ comment_review_workflow_enabled = \
'comment_review_workflow' in workflow_chain 'comment_review_workflow' in workflow_chain
if one_state_workflow_enabled or comment_review_workflow_enabled: if one_state_workflow_enabled or comment_review_workflow_enabled:

1
plone/app/discussion/comment.py
View File

@ -207,6 +207,7 @@ class Comment(CatalogAware, WorkflowAware, DynamicType, Traversable,
def opaqueValues(self): # pragma: no cover def opaqueValues(self): # pragma: no cover
return [] return []
CommentFactory = Factory(Comment) CommentFactory = Factory(Comment)

3
plone/app/discussion/tests/test_controlpanel.py
View File

@ -163,7 +163,8 @@ class ConfigurationChangedSubscriberTest(unittest.TestCase):
the 'comment_moderation' setting in the discussion control panel the 'comment_moderation' setting in the discussion control panel
changes. changes.
""" """
# By default the comment_one_state_workflow without moderation is enabled # By default the comment_one_state_workflow without moderation is
# enabled
self.assertEqual( self.assertEqual(
('comment_one_state_workflow',), ('comment_one_state_workflow',),
self.portal.portal_workflow.getChainForPortalType( self.portal.portal_workflow.getChainForPortalType(