Make addition of line about new submission/comment at top of each message...

...configurable

Make presence of e-mail address in the added line configurable.

Author: Erik Forsberg

roundup/configuration.py

@@ -1,6 +1,6 @@
 # Roundup Issue Tracker configuration support
 #
-# $Id: configuration.py,v 1.43 2007-05-12 16:14:54 forsberg Exp $
+# $Id: configuration.py,v 1.44 2007-09-01 16:30:11 forsberg Exp $
 #
 __docformat__ = "restructuredtext"
 
@@ -635,6 +635,12 @@ def str2value(self, value):
             "messages to this file *instead* of sending them.\n"
             "This option has the same effect as environment variable"
             " SENDMAILDEBUG.\nEnvironment variable takes precedence."),
+        (BooleanOption, "add_authorinfo", "yes",
+            "Add a line with author information at top of all messages\n"
+            "sent by roundup"),
+        (BooleanOption, "add_authoremail", "yes",
+            "Add the mail address of the author to the author information at\n"
+            "added if add_authorinfo is true."),
     ), "Outgoing email options.\nUsed for nozy messages and approval requests"),
     ("mailgw", (
         (BooleanOption, "keep_quoted_text", "yes",

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.128 2006-12-18 11:34:41 a1s Exp $
+# $Id: roundupdb.py,v 1.129 2007-09-01 16:30:11 forsberg Exp $
 
 """Extending hyperdb with types specific to issue-tracking.
 """
@@ -292,8 +292,10 @@ def send_message(self, nodeid, msgid, note, sendto, from_address=None,
             authname = 'admin'
             authaddr = self.db.config.ADMIN_EMAIL
 
-        if authaddr:
+        if authaddr and self.db.config.MAIL_ADD_AUTHOREMAIL:
             authaddr = " <%s>" % straddr( ('',authaddr) )
+        elif authaddr:
+            authaddr = ""
 
         # make the message body
         m = ['']
@@ -303,16 +305,18 @@ def send_message(self, nodeid, msgid, note, sendto, from_address=None,
             m.append(self.email_signature(nodeid, msgid))
 
         # add author information
-        if authid:
+        if authid and self.db.config.MAIL_ADD_AUTHORINFO:
             if len(self.get(nodeid,'messages')) == 1:
+                
                 m.append(_("New submission from %(authname)s%(authaddr)s:")
                     % locals())
             else:
                 m.append(_("%(authname)s%(authaddr)s added the comment:")
                     % locals())
-        else:
+            m.append('')
+        elif self.db.config.MAIL_ADD_AUTHORINFO:
             m.append(_("System message:"))
-        m.append('')
+            m.append('')
 
         # add the content
         if msgid is not None:

test/test_mailgw.py

@@ -8,7 +8,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id: test_mailgw.py,v 1.86 2007-09-01 16:14:21 forsberg Exp $
+# $Id: test_mailgw.py,v 1.87 2007-09-01 16:30:11 forsberg Exp $
 
 # TODO: test bcc
 
@@ -258,6 +258,88 @@ def testNewIssueAuthMsg(self):
 _______________________________________________________________________
 ''')
 
+    def testNewIssueNoAuthorInfo(self):
+        self.db.config.MAIL_ADD_AUTHORINFO = 'no'
+        self._handle_mail('''Content-Type: text/plain;
+  charset="iso-8859-1"
+From: Chef <[email protected]>
+To: [email protected]
+Message-Id: <dummy_test_message_id>
+Subject: [issue] Testing... [nosy=mary; assignedto=richard]
+
+This is a test submission of a new issue.
+''')
+        self.compareMessages(self._get_mail(),
+'''FROM: [email protected]
+TO: [email protected], mary@test, richard@test
+Content-Type: text/plain; charset=utf-8
+Subject: [issue1] Testing...
+To: mary@test, richard@test
+From: "Bork, Chef" <[email protected]>
+Reply-To: Roundup issue tracker <[email protected]>
+MIME-Version: 1.0
+Message-Id: <dummy_test_message_id>
+X-Roundup-Name: Roundup issue tracker
+X-Roundup-Loop: hello
+Content-Transfer-Encoding: quoted-printable
+
+This is a test submission of a new issue.
+
+----------
+assignedto: richard
+messages: 1
+nosy: Chef, mary, richard
+status: unread
+title: Testing...
+
+_______________________________________________________________________
+Roundup issue tracker <[email protected]>
+<http://tracker.example/cgi-bin/roundup.cgi/bugs/issue1>
+_______________________________________________________________________
+''')
+
+    def testNewIssueNoAuthorEmail(self):
+        self.db.config.MAIL_ADD_AUTHOREMAIL = 'no'
+        self._handle_mail('''Content-Type: text/plain;
+  charset="iso-8859-1"
+From: Chef <[email protected]>
+To: [email protected]
+Message-Id: <dummy_test_message_id>
+Subject: [issue] Testing... [nosy=mary; assignedto=richard]
+
+This is a test submission of a new issue.
+''')
+        self.compareMessages(self._get_mail(),
+'''FROM: [email protected]
+TO: [email protected], mary@test, richard@test
+Content-Type: text/plain; charset=utf-8
+Subject: [issue1] Testing...
+To: mary@test, richard@test
+From: "Bork, Chef" <[email protected]>
+Reply-To: Roundup issue tracker <[email protected]>
+MIME-Version: 1.0
+Message-Id: <dummy_test_message_id>
+X-Roundup-Name: Roundup issue tracker
+X-Roundup-Loop: hello
+Content-Transfer-Encoding: quoted-printable
+
+New submission from Bork, Chef:
+
+This is a test submission of a new issue.
+
+----------
+assignedto: richard
+messages: 1
+nosy: Chef, mary, richard
+status: unread
+title: Testing...
+
+_______________________________________________________________________
+Roundup issue tracker <[email protected]>
+<http://tracker.example/cgi-bin/roundup.cgi/bugs/issue1>
+_______________________________________________________________________
+''')                
+
     # BUG
     # def testMultipart(self):
     #         '''With more than one part'''