merge upstream and fix numbering

This commit is contained in:
maartenkling 2014-03-04 09:16:36 +01:00
commit 0ea9a7131f
6 changed files with 22 additions and 7 deletions

View File

@ -1,13 +1,28 @@
Changelog Changelog
========= =========
2.3.0 (unreleased) 2.3.2 (unreleased)
------------------ ------------------
- use member.getId as author_username, so membrane users having different id - use member.getId as author_username, so membrane users having different id
then username still have there picture shown and author path is correct. then username still have there picture shown and author path is correct.
[maartenkling] [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 - Corrections and additions to the Danish translation
[aputtu] [aputtu]

View File

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

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)

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(

View File

@ -299,7 +299,7 @@ Login as admin.
Edit the content object. Edit the content object.
>>> browser.open("http://nohost/plone/doc1/edit") >>> 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() >>> browser.getControl('Save').click()
Make sure the edit was successful. Make sure the edit was successful.

View File

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