Ticket #1383: improved_notifications_6233.diff

trac/ticket/notification.py

@@ -75 +75 @@
         change_data = {}
         link = self.env.abs_href.ticket(ticket.id)
         summary = self.ticket['summary']
+        author = ''
         
         if not self.newticket and modtime:  # Ticket change
             from trac.ticket.web_ui import TicketModule
@@ -88 +89 @@
                                     CRLF)
                     })
                 link += '#comment:%s' % str(change.get('cnum', ''))
+                author = change['author']
                 for field, values in change['fields'].iteritems():
                     old = values['old']
                     new = values['new']
@@ -127 +129 @@
                         changes_body += '  * %s:  %s%s' % (field, chg, CRLF)
                     if newv:
                         change_data[field] = {'oldvalue': old, 'newvalue': new}
+
+        if self.newticket:
+            author = ticket["reporter"]
             
         self.ticket['description'] = wrap(
             self.ticket.values.get('description', ''), self.COLS,
@@ -146 +151 @@
             'changes_descr': changes_descr,
             'change': change_data
             })
-        NotifyEmail.notify(self, ticket.id, subject)
+        NotifyEmail.notify(self, ticket.id, subject, author)
 
     def format_props(self):
         tkt = self.ticket

trac/notification.py

@@ -213 +213 @@
         else:
             raise TracError(_('Invalid email encoding setting: %s' % pref))
 
-    def notify(self, resid, subject):
+    def notify(self, resid, subject, from_name=None):
         self.subject = subject
 
         if not self.config.getbool('notification', 'smtp_enabled'):
@@ -231 +231 @@
                                         ' nor ', tag.b('notification.reply_to'),
                                         'are specified in the configuration.')),
                               'SMTP Notification Error')
+        if not self.from_name:
+            self.from_name = from_name
 
         # Authentication info (optional)
         self.user_name = self.config['notification'].get('smtp_user')