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

Merge pull request #42 from eea/master

Browse Source 
Comments do not retain Mark for Deletion state
This commit is contained in:
Alexandru Ghica 2014-02-04 02:15:24 -08:00
commit fe747f2ae9
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.rst
View File

@ -4,6 +4,9 @@ Changelog
2.3.0 (unreleased) 2.3.0 (unreleased)
------------------ ------------------
- Execute the property workflow
[omiron]
- Corrections and additions to the Danish translation - Corrections and additions to the Danish translation
[aputtu] [aputtu]

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

@ -151,7 +151,7 @@
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: form_url, url: form_url,
data: "workflow_action=publish", data: data,
context: trigger, context: trigger,
success: function (msg) { success: function (msg) {
// remove button (trigger object can't be directly removed) // remove button (trigger object can't be directly removed)

5
plone/app/discussion/browser/moderation.py
View File

@ -131,9 +131,8 @@ class PublishComment(BrowserView):
comment = aq_inner(self.context) comment = aq_inner(self.context)
content_object = aq_parent(aq_parent(comment)) content_object = aq_parent(aq_parent(comment))
workflowTool = getToolByName(comment, 'portal_workflow', None) workflowTool = getToolByName(comment, 'portal_workflow', None)
current_state = workflowTool.getInfoFor(comment, 'review_state') workflow_action = self.request.form.get('workflow_action', 'publish')
if current_state != 'published': workflowTool.doActionFor(comment, workflow_action)
workflowTool.doActionFor(comment, 'publish')
comment.reindexObject() comment.reindexObject()
content_object.reindexObject() content_object.reindexObject()
IStatusMessage(self.context.REQUEST).addStatusMessage( IStatusMessage(self.context.REQUEST).addStatusMessage(