fix email change note rendering of multiline properties (patch [SF#1575223])

Author: Richard Jones

CHANGES.txt

@@ -13,6 +13,7 @@ Fixed:
 - roundup-server called setuid when run by non-root user
 - fix sort/group direction checkbox in issue.index.html (sf bug 1593025)
 - fix error detection for non-EN locales of postgres (sf bug 1592249)
+- fix email change note rendering of multiline properties (sf patch 1575223)
 
 
 2006-10-07 1.2.1

doc/index.txt

@@ -81,6 +81,7 @@ Roch'e Compaan,
 Wil Cooley,
 Joe Cooper,
 Kelley Dagley,
+Toby Dickenson,
 Paul F. Dubois,
 Eric Earnst,
 Andrew Eland,

roundup/roundupdb.py

@@ -16,7 +16,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: roundupdb.py,v 1.125 2006-09-09 05:50:17 richard Exp $
+# $Id: roundupdb.py,v 1.126 2006-11-09 01:13:56 richard Exp $
 
 """Extending hyperdb with types specific to issue-tracking.
 """
@@ -496,6 +496,10 @@ def generateCreateNote(self, nodeid):
                     value = [link.get(entry, key) for entry in value]
                 value.sort()
                 value = ', '.join(value)
+            else:
+                value = str(value)
+                if '\n' in value:
+                    value = '\n'+self.indentChangeNoteValue(value)
             m.append('%s: %s'%(propname, value))
         m.insert(0, '----------')
         m.insert(0, '')
@@ -587,10 +591,19 @@ def generateChangeNote(self, nodeid, oldvalues):
                     change += ' -%s'%(', '.join(l))
             else:
                 change = '%s -> %s'%(oldvalue, value)
+                if '\n' in change:
+                    value = self.indentChangeNoteValue(str(value))
+                    oldvalue = self.indentChangeNoteValue(str(oldvalue))
+                    change = '\nNow:\n%s\nWas:\n%s'%(value, oldvalue)
             m.append('%s: %s'%(propname, change))
         if m:
             m.insert(0, '----------')
             m.insert(0, '')
         return '\n'.join(m)
 
+    def indentChangeNoteValue(self, text):
+        lines = text.rstrip('\n').split('\n')
+        lines = [ '  '+line for line in lines ]
+        return '\n'.join(lines)
+
 # vim: set filetype=python sts=4 sw=4 et si :