[Checkins] SVN: Products.DCWorkflow/branches/2.2/Products/DCWorkflow/ Backported c117070 from trunk

[Hanno Schlichting]

Log message for revision 118256:
  Backported c117070 from trunk
  

Changed:
  U   Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt
  U   Products.DCWorkflow/branches/2.2/Products/DCWorkflow/dtml/states.dtml

-=-
Modified: Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt
===================================================================
--- Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt	2010-11-06 11:46:24 UTC (rev 118255)
+++ Products.DCWorkflow/branches/2.2/Products/DCWorkflow/CHANGES.txt	2010-11-06 11:48:13 UTC (rev 118256)
@@ -4,6 +4,8 @@
 2.2.2 (unreleased)
 ------------------
 
+- Workflow states cannot be renamed through the ZMI.
+  (https://bugs.launchpad.net/zope-cmf/+bug/625722)
 
 2.2.1 (2010-07-04)
 ------------------

Modified: Products.DCWorkflow/branches/2.2/Products/DCWorkflow/dtml/states.dtml
===================================================================
--- Products.DCWorkflow/branches/2.2/Products/DCWorkflow/dtml/states.dtml	2010-11-06 11:46:24 UTC (rev 118255)
+++ Products.DCWorkflow/branches/2.2/Products/DCWorkflow/dtml/states.dtml	2010-11-06 11:48:13 UTC (rev 118256)
@@ -50,11 +50,6 @@
 </dtml-in>
 </table>
 <dtml-if values>
-<p>
-  <b>Note:</b> Renaming a state will not affect any items in that state. You
-  will need to fix them manually.
-</p>  
-<input type="submit" name="manage_renameForm:method" value="Rename" />
 <input type="submit" name="deleteStates:method" value="Delete" />
 <input type="submit" name="setInitialState:method" value="Set Initial State" />
 </dtml-if>