kallithea Changeset - d4061c6cc0e2

Changeset - d4061c6cc0e2

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 9 years ago 2016-07-28 16:34:29
madski@unity3d.com

notifications: tweak PR mail subject lines

The subject line is used for mail threading in gmail and can thus not be
changed without impacting users ... but now we do it.

* The tag '[Review]' is more spot-on than '[Added]'.
* The subject should be short so it fits on one line, so abbreviate "pull
request" to PR.
* Add the PR owner - convenient for filtering comments on own PRs from comments
on other PRs.

5 files changed with 15 insertions and 12 deletions:

kallithea/model/comment.py

kallithea/model/notification.py

kallithea/model/pull_request.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

@@ @@ -150,12 +150,13 @@ class ChangesetCommentsModel(BaseModel): @@
                                    repo_name=pull_request.other_repo.repo_name),
                 'pr_target_branch': other_ref_name,
                 'pr_source_repo': h.canonical_url('summary_home',
                                    repo_name=pull_request.org_repo.repo_name),
                 'pr_source_branch': org_ref_name,
                 'pr_owner': pull_request.owner,
                 'pr_owner_username': pull_request.owner.username,
                 'repo_name': pull_request.other_repo.repo_name,
                 'comment_username': user.username,
                 'threading': threading,
+            }
         return subj, body, recipients, notification_type, email_kwargs

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -301,14 +301,14 @@ class EmailNotificationModel(BaseModel): @@
         self._subj_map = {
             self.TYPE_CHANGESET_COMMENT: _('[Comment] %(repo_name)s changeset %(short_id)s "%(message_short)s" on %(branch)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: _('[Added] %(repo_name)s pull request %(pr_nice_id)s "%(pr_title_short)s" from %(pr_source_branch)s'),
             self.TYPE_PULL_REQUEST_COMMENT: _('[Comment] %(repo_name)s pull request %(pr_nice_id)s "%(pr_title_short)s" from %(pr_source_branch)s'),
             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/model/pull_request.py

➞

Show inline comments

@@ @@ -168,12 +168,13 @@ class PullRequestModel(BaseModel): @@
                                repo_name=pr.other_repo.repo_name),
             'pr_target_branch': other_ref_name,
             'pr_source_repo': h.canonical_url('summary_home',
                                repo_name=pr.org_repo.repo_name),
             'pr_source_branch': org_ref_name,
             'pr_owner': pr.owner,
             'pr_owner_username': pr.owner.username,
             'pr_username': user.username,
             'threading': threading,
             'is_mention': False,
+            }
         if reviewers:
             NotificationModel().create(created_by=user, subject=subject, body=body,

kallithea/tests/models/test_dump_html_mails.ref.html

➞

Show inline comments

@@ @@ -283,13 +283,13 @@ This is an automatic notification. Don&# @@
 <h1>pull_request, is_mention=False</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Added] repo/name pull request #7 "The Title" from devbranch
+Subject: [Review] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Requesting User (root) requested your review of repo/name pull request "The Title"
@@ @@ -348,13 +348,13 @@ This is an automatic notification. Don&# @@
 <h1>pull_request, is_mention=True</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Added] repo/name pull request #7 "The Title" from devbranch
+Subject: [Review] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Requesting User (root) mentioned you on repo/name pull request "The Title"
@@ @@ -413,13 +413,13 @@ This is an automatic notification. Don&# @@
 <h1>pull_request_comment, is_mention=False, status_change=None, closing_pr=False</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
@@ @@ -456,13 +456,13 @@ This is an automatic notification. Don&# @@
 <h1>pull_request_comment, is_mention=True, status_change=None, closing_pr=False</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
@@ @@ -499,13 +499,13 @@ This is an automatic notification. Don&# @@
 <h1>pull_request_comment, is_mention=False, status_change='Under Review', closing_pr=False</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Under Review: Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Under Review: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
@@ @@ -544,13 +544,13 @@ This is an automatic notification. Don&# @@
 <h1>pull_request_comment, is_mention=True, status_change='Under Review', closing_pr=False</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Under Review: Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Under Review: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
@@ @@ -589,13 +589,13 @@ This is an automatic notification. Don&# @@
 <h1>pull_request_comment, is_mention=False, status_change=None, closing_pr=True</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Closing: Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Closing: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
@@ @@ -632,13 +632,13 @@ This is an automatic notification. Don&# @@
 <h1>pull_request_comment, is_mention=True, status_change=None, closing_pr=True</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Closing: Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Closing: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
@@ @@ -675,13 +675,13 @@ This is an automatic notification. Don&# @@
 <h1>pull_request_comment, is_mention=False, status_change='Under Review', closing_pr=True</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Under Review, Closing: Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Under Review, Closing: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!
@@ @@ -720,13 +720,13 @@ This is an automatic notification. Don&# @@
 <h1>pull_request_comment, is_mention=True, status_change='Under Review', closing_pr=True</h1>
 <pre>
 From: u1
 To: u2@example.com
-Subject: [Under Review, Closing: Comment] repo/name pull request #7 "The Title" from devbranch
+Subject: [Under Review, Closing: Comment] repo/name PR #7 "The Title" from devbranch by u2
 --------------------
 Comment from Opinionated User (jsmith) on repo/name pull request "The Title":
 Me too!

kallithea/tests/models/test_notifications.py

➞

Show inline comments

@@ @@ -189,12 +189,13 @@ class TestNotifications(TestController): @@
                 pr_url='http://pr.org/7',
                 pr_target_repo='http://mainline.com/repo',
                 pr_target_branch='trunk',
                 pr_source_repo='https://dev.org/repo',
                 pr_source_branch='devbranch',
                 pr_owner=User.get(self.u2),
                 pr_owner_username='u2'
+                )
             for type_, body, kwargs in [
                 (Notification.TYPE_CHANGESET_COMMENT,
                  u'This is the new comment.\n\n - and here it ends indented.',
                  dict(

0 comments (0 inline, 0 general)