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

Merge pull request #19 from thet/master 

apply published state for migrations of broken comments
This commit is contained in:
Timo Stollenwerk 2012-11-02 09:04:20 -07:00
parent d2ccec6efe 882236cb15
commit 2df4cf0765
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES.txt
View File

@ -4,6 +4,10 @@ Changelog
2.2.1 (unreleased) 2.2.1 (unreleased)
------------------ ------------------
- For migrations of comments without a valid old_status, apply the 'published'
state.
[thet]
- Re-apply eleddy's "Revert modification date since this is fixed in - Re-apply eleddy's "Revert modification date since this is fixed in
p.a.caching now." as her commit was lost later on due to some git magic. p.a.caching now." as her commit was lost later on due to some git magic.
[thet] [thet]

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

@ -121,9 +121,10 @@ class View(BrowserView):
'action': None, 'action': None,
'actor': None, 'actor': None,
'comment': 'Migrated workflow state', 'comment': 'Migrated workflow state',
'review_state': old_status.get( 'review_state': old_status and old_status.get(
'review_state', 'review_state',
new_workflow.initial_state), new_workflow.initial_state)
or 'published',
'time': DateTime() 'time': DateTime()
} }
workflow.setStatusOf('comment_review_workflow', workflow.setStatusOf('comment_review_workflow',