[Zope-Checkins] SVN: Zope/trunk/ Make undo log easier to read.

[Tres Seaver]

Log message for revision 112137:
  Make undo log easier to read.
  
  Thanks to Toby Dickinson for the patch.
  
  LP #142464
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/App/Undo.py
  U   Zope/trunk/src/App/dtml/undo.dtml
  U   Zope/trunk/src/OFS/dtml/history.dtml

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2010-05-07 14:25:08 UTC (rev 112136)
+++ Zope/trunk/doc/CHANGES.rst	2010-05-07 15:08:07 UTC (rev 112137)
@@ -93,6 +93,9 @@
 Features Added
 ++++++++++++++
 
+- LP #142464:  Make undo log easier to read.  Thanks to Toby Dickinson
+  for the patch.
+
 - LP #142401:  Added a link in the ZMI tree pane to make the tree state
   persistent.  Thanks to Lalo Martins for the patch.
 

Modified: Zope/trunk/src/App/Undo.py
===================================================================
--- Zope/trunk/src/App/Undo.py	2010-05-07 14:25:08 UTC (rev 112136)
+++ Zope/trunk/src/App/Undo.py	2010-05-07 15:08:07 UTC (rev 112137)
@@ -121,7 +121,7 @@
             if desc:
                 desc = desc.split()
                 d1 = desc[0]
-                desc = ''.join(desc[1:])
+                desc = ' '.join(desc[1:])
                 if len(desc) > 60:
                     desc = desc[:56] + ' ...'
                 tid = "%s %s %s %s" % (encode64(tid), t, d1, desc)
@@ -140,7 +140,7 @@
         for tid in transaction_info:
             tid=tid.split()
             if tid:
-                transaction.get().note("Undo %s" % ''.join(tid[1:]))
+                transaction.get().note("Undo %s" % ' '.join(tid[1:]))
                 tid=decode64(tid[0])
                 undo(tid)
 

Modified: Zope/trunk/src/App/dtml/undo.dtml
===================================================================
--- Zope/trunk/src/App/dtml/undo.dtml	2010-05-07 14:25:08 UTC (rev 112136)
+++ Zope/trunk/src/App/dtml/undo.dtml	2010-05-07 15:08:07 UTC (rev 112137)
@@ -66,7 +66,7 @@
     </td>
     <td align="left" valign="top">
     <div class="list-item">
-    &dtml-description; by <strong><dtml-if 
+    <dtml-var description html_quote newline_to_br> by <strong><dtml-if 
      user_name>&dtml-user_name;<dtml-else
      ><em>Zope</em></dtml-if></strong>
     </div>

Modified: Zope/trunk/src/OFS/dtml/history.dtml
===================================================================
--- Zope/trunk/src/OFS/dtml/history.dtml	2010-05-07 14:25:08 UTC (rev 112136)
+++ Zope/trunk/src/OFS/dtml/history.dtml	2010-05-07 15:08:07 UTC (rev 112137)
@@ -48,7 +48,7 @@
         <div class="list-item">
 	<a href="&dtml-absolute_url;/HistoricalRevisions/&dtml-key;/manage_workspace"><dtml-var time fmt="%Y-%m-%d %H:%M"><dtml-if 
         user_name> (&dtml-user_name;)</dtml-if></a>
-        <br>&dtml-description;
+        <br><dtml-var description html_quote newline_to_br>
 	<dtml-if revision>
         <br>revision: <em>&dtml-revision;</em>
         </dtml-if>