[CMF-checkins] CVS: CMF/CMFCollector - CollectorIssue.py:1.27

[Ken Manheimer]

Update of /cvs-repository/CMF/CMFCollector
In directory cvs.zope.org:/tmp/cvs-serv1975

Modified Files:
	CollectorIssue.py 
Log Message:
Changes to tame the structured text problems, and remove the
processing for the emailled version of the transcript.  (I'm coming to
think ST isn't right for bug reports.  We need a *much* smaller subset
- text flow with blank-line broken paragraphs, and preformatting for
code, *maybe* some more - but nothing for the sake of expressivity,
just for the sake of taming web transformation of text.)

.do_action(), .edit(): don't strip the comment, process_comment()'ll
take care of whatever needs doing.

._send_update_notice(): unprocess_comments() before sending as email.


=== CMF/CMFCollector/CollectorIssue.py 1.26 => 1.27 ===
 
         if comment:
-            comment = "\n\n" + util.process_comment(string.strip(comment))
+            comment = "\n\n" + util.process_comment(comment)
         else:
             comment = ''
 
@@ -383,8 +383,8 @@
 
         transcript._edit('stx',
                          comment_header_str
-                         + util.process_comment(string.strip(comment))
-                         + ((action_number > 1) and "\n<hr>\n" or '')
+                         + util.process_comment(comment)
+                         + ((action_number > 1) and "\n\n<hr>\n" or '')
                          + transcript.EditableBody())
         self.reindexObject()
         self._send_update_notice(action, username,
@@ -487,7 +487,8 @@
                        % (subject, self.id, self.action_number,
                           string.capitalize(action), self.title))
 
-            body = self._cook_links(self.get_transcript().text, email=1)
+            body = util.unprocess_comments(self.get_transcript().text)
+            body = self._cook_links(body, email=1)
             cin = self.collector_issue_notice
             message = cin(sender=sender,
                           recipients=to,