kallithea Changeset - 5fe492c6d7d7

Changeset - 5fe492c6d7d7

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Thomas De Schampheleire - 6 years ago 2020-03-22 00:00:44
thomas.de_schampheleire@nokia.com

Grafted from: 78778bb6b969

comments: add changeset author in mail notification subject

In analogy to the handling of comments on pull requests, as changed in
commit d4061c6cc0e2.

4 files changed with 7 insertions and 5 deletions:

kallithea/model/comment.py

kallithea/model/notification.py

kallithea/tests/models/test_dump_html_mails.ref.html

kallithea/tests/models/test_notifications.py

0 comments (0 inline, 0 general)

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -96,24 +96,25 @@ class ChangesetCommentsModel(object): @@
             recipients.append(cs_author)
             email_kwargs = {
                 'status_change': status_change,
                 'cs_comment_user': author.full_name_and_username,
                 'cs_target_repo': h.canonical_url('summary_home', repo_name=repo.repo_name),
                 'cs_comment_url': comment_url,
                 'cs_url': h.canonical_url('changeset_home', repo_name=repo.repo_name, revision=revision),
                 'raw_id': revision,
                 'message': cs.message,
                 'message_short': h.shorter(cs.message, 50, firstline=True),
                 'cs_author': cs_author,
                 'cs_author_username': cs_author.username,
                 'repo_name': repo.repo_name,
                 'short_id': h.short_id(revision),
                 'branch': cs.branch,
                 'comment_username': author.username,
                 'threading': threading,
+            }
         # pull request
         elif pull_request:
             notification_type = NotificationModel.TYPE_PULL_REQUEST_COMMENT
             desc = comment.pull_request.title
             _org_ref_type, org_ref_name, _org_rev = comment.pull_request.org_ref.split(':')
             _other_ref_type, other_ref_name, _other_rev = comment.pull_request.other_ref.split(':')

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -156,25 +156,25 @@ class EmailNotificationModel(object): @@
     def __init__(self):
         super(EmailNotificationModel, self).__init__()
         self._tmpl_lookup = app_globals.mako_lookup
         self.email_types = {
             self.TYPE_CHANGESET_COMMENT: 'changeset_comment',
             self.TYPE_PASSWORD_RESET: 'password_reset',
             self.TYPE_REGISTRATION: 'registration',
             self.TYPE_DEFAULT: 'default',
             self.TYPE_PULL_REQUEST: 'pull_request',
             self.TYPE_PULL_REQUEST_COMMENT: 'pull_request_comment',
+        }
         self._subj_map = {
             self.TYPE_CHANGESET_COMMENT: _('[Comment] %(repo_name)s changeset %(short_id)s "%(message_short)s" on %(branch)s'),
+            self.TYPE_CHANGESET_COMMENT: _('[Comment] %(repo_name)s changeset %(short_id)s "%(message_short)s" on %(branch)s by %(cs_author_username)s'),
             self.TYPE_MESSAGE: 'Test Message',
             # self.TYPE_PASSWORD_RESET
             self.TYPE_REGISTRATION: _('New user %(new_username)s registered'),
             # self.TYPE_DEFAULT
             self.TYPE_PULL_REQUEST: _('[Review] %(repo_name)s PR %(pr_nice_id)s "%(pr_title_short)s" from %(pr_source_branch)s by %(pr_owner_username)s'),
             self.TYPE_PULL_REQUEST_COMMENT: _('[Comment] %(repo_name)s PR %(pr_nice_id)s "%(pr_title_short)s" from %(pr_source_branch)s by %(pr_owner_username)s'),
+        }
     def get_email_description(self, type_, **kwargs):
         """
         return subject for email based on given type
         """

kallithea/tests/models/test_dump_html_mails.ref.html

➞

Show inline comments

 <!doctype html>
 <html lang="en">
 <head><title>Notifications</title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head>
 <body>
 <hr/>
 <h1>cs_comment, is_mention=False, status_change=None</h1>
 <pre>
 From: u1 u1 <name@example.com>
 To: u2@example.com
 Subject: [Comment] repo/name changeset cafe1234 "This changeset did something cl..." on brunch
+Subject: [Comment] repo/name changeset cafe1234 "This changeset did something cl..." on brunch by u2
 </pre>
 <hr/>
 <pre>http://comment.org
 Comment on Changeset "This changeset did something clever which is hard to explain"
 Opinionated User (jsmith):
 This is the new 'comment'.
  - and here it ends indented.
@@ @@ -157,25 +157,25 @@ View Comment: http://comment.org @@
         </td>
         <td width="30px" style="width:30px"></td>
     </tr>
 </table>
 <!--/body-->
 <!--/html-->
 <hr/>
 <hr/>
 <h1>cs_comment, is_mention=True, status_change=None</h1>
 <pre>
 From: u1 u1 <name@example.com>
 To: u2@example.com
 Subject: [Comment] repo/name changeset cafe1234 "This changeset did something cl..." on brunch
+Subject: [Comment] repo/name changeset cafe1234 "This changeset did something cl..." on brunch by u2
 </pre>
 <hr/>
 <pre>http://comment.org
 Mention in Comment on Changeset "This changeset did something clever which is hard to explain"
 Opinionated User (jsmith):
 This is the new 'comment'.
  - and here it ends indented.
@@ @@ -316,25 +316,25 @@ View Comment: http://comment.org @@
         </td>
         <td width="30px" style="width:30px"></td>
     </tr>
 </table>
 <!--/body-->
 <!--/html-->
 <hr/>
 <hr/>
 <h1>cs_comment, is_mention=False, status_change='Approved'</h1>
 <pre>
 From: u1 u1 <name@example.com>
 To: u2@example.com
 Subject: [Approved: Comment] repo/name changeset cafe1234 "This changeset did something cl..." on brunch
+Subject: [Approved: Comment] repo/name changeset cafe1234 "This changeset did something cl..." on brunch by u2
 </pre>
 <hr/>
 <pre>http://comment.org
 Comment on Changeset "This changeset did something clever which is hard to explain"
 Opinionated User (jsmith):
 Status change: Approved
 This is the new 'comment'.
@@ @@ -493,25 +493,25 @@ View Comment: http://comment.org @@
         </td>
         <td width="30px" style="width:30px"></td>
     </tr>
 </table>
 <!--/body-->
 <!--/html-->
 <hr/>
 <hr/>
 <h1>cs_comment, is_mention=True, status_change='Approved'</h1>
 <pre>
 From: u1 u1 <name@example.com>
 To: u2@example.com
 Subject: [Approved: Comment] repo/name changeset cafe1234 "This changeset did something cl..." on brunch
+Subject: [Approved: Comment] repo/name changeset cafe1234 "This changeset did something cl..." on brunch by u2
 </pre>
 <hr/>
 <pre>http://comment.org
 Mention in Comment on Changeset "This changeset did something clever which is hard to explain"
 Opinionated User (jsmith):
 Status change: Approved
 This is the new 'comment'.

kallithea/tests/models/test_notifications.py

➞

Show inline comments

@@ @@ -94,24 +94,25 @@ class TestNotifications(base.TestControl @@
                          dict(
                             short_id='cafe1234',
                             raw_id='cafe1234c0ffeecafe',
                             branch='brunch',
                             cs_comment_user='Opinionated User (jsmith)',
                             cs_comment_url='http://comment.org',
                             is_mention=[False, True],
                             message='This changeset did something clever which is hard to explain',
                             message_short='This changeset did something cl...',
                             status_change=[None, 'Approved'],
                             cs_target_repo='http://example.com/repo_target',
                             cs_url='http://changeset.com',
                             cs_author_username=User.get(self.u2).username,
                             cs_author=User.get(self.u2))),
                         (NotificationModel.TYPE_MESSAGE,
                          'This is the \'body\' of the "test" message\n - nothing interesting here except indentation.',
                          dict()),
                         #(NotificationModel.TYPE_MENTION, '$body', None), # not used
                         (NotificationModel.TYPE_REGISTRATION,
                          'Registration body',
                          dict(
                             new_username='newbie',
                             registered_user_url='http://newbie.org',
                             new_email='new@email.com',
                             new_full_name='New Full Name')),

0 comments (0 inline, 0 general)