merge upstream and fix numbering

CHANGES.rst

@@ -1,13 +1,28 @@
 Changelog
 =========
 
-2.3.0 (unreleased)
+2.3.2 (unreleased)
 ------------------
 
 - use member.getId as author_username, so membrane users having different id
   then username still have there picture shown and author path is correct.
   [maartenkling]
 
+
+2.3.1 (2014-02-22)
+------------------
+
+- 2.3.0 was a brown bag release.
+  [timo]
+
+
+2.3.0 (2014-02-22)
+------------------
+
+- Execute the proper workflow change when using the moderation buttons instead
+  of hardcoding the workflow action to always publish
+  [omiron]
+
 - Corrections and additions to the Danish translation
   [aputtu]
 

MANIFEST.in

@@ -1,4 +1,5 @@
 include *.txt
+include *.rst
 
 recursive-include docs *
 recursive-include plone *

plone/app/discussion/browser/javascripts/comments.js

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

plone/app/discussion/browser/moderation.py

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

plone/app/discussion/tests/functional_test_comments.txt

@@ -299,7 +299,7 @@ Login as admin.
 Edit the content object.
 
     >>> browser.open("http://nohost/plone/doc1/edit")
-    >>> browser.getControl(name='form.widgets.text').value = "Lorem ipsum"
+    >>> browser.getControl(name='form.widgets.IRichText.text').value = "Lorem ipsum"
     >>> browser.getControl('Save').click()
 
 Make sure the edit was successful.

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '2.3.0dev'
+version = '2.3.2.dev0'
 
 install_requires = [
     'setuptools',