kallithea Changeset - 231442b0b6aa

Changeset - 231442b0b6aa

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich - 11 years ago 2014-08-01 20:28:42
madski@unity3d.com

pull requests: handle @mention in PR description ... but so far without fancy js completion

5 files changed with 44 insertions and 5 deletions:

kallithea/controllers/pullrequests.py

kallithea/model/comment.py

kallithea/model/pull_request.py

kallithea/templates/email_templates/changeset_comment.html

kallithea/templates/email_templates/pull_request.html

0 comments (0 inline, 0 general)

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -552,18 +552,21 @@ class PullrequestsController(BaseRepoCon @@
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def post(self, repo_name, pull_request_id):
         repo = RepoModel()._get_repo(repo_name)
         pull_request = PullRequest.get_or_404(pull_request_id)
         old_description = pull_request.description
         _form = PullRequestPostForm()().to_python(request.POST)
         pull_request.title = _form['pullrequest_title']
         pull_request.description = _form['pullrequest_desc'].strip() or _('No description')
         PullRequestModel().mention_from_description(pull_request, old_description)
         Session().commit()
         h.flash(_('Pull request updated'), category='success')
         return redirect(url('pullrequest_show', repo_name=repo.repo_name,
                             pull_request_id=pull_request_id))

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -219,23 +219,24 @@ class ChangesetCommentsModel(BaseModel): @@
                                 comment_text=text,
                                 line_no=line_no,
                                 revision=revision,
                                 pull_request=pull_request,
                                 status_change=status_change,
                                 closing_pr=closing_pr)
             email_kwargs['is_mention'] = False
             # create notification objects, and emails
             NotificationModel().create(
                 created_by=user, subject=subj, body=body,
                 recipients=recipients, type_=notification_type,
                 email_kwargs=email_kwargs,
+            )
             mention_recipients = set(self._extract_mentions(body))\
                                     .difference(recipients)
             if mention_recipients:
-                email_kwargs.update({'pr_mention': True})
+                email_kwargs['is_mention'] = True
                 subj = _('[Mention]') + ' ' + subj
                 NotificationModel().create(
                     created_by=user, subject=subj, body=body,
                     recipients=mention_recipients,
                     type_=notification_type,
                     email_kwargs=email_kwargs

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -31,15 +31,15 @@ import datetime @@
 from pylons.i18n.translation import _
 from kallithea.model.meta import Session
 from kallithea.lib import helpers as h
 from kallithea.model import BaseModel
 from kallithea.model.db import PullRequest, PullRequestReviewers, Notification,\
     ChangesetStatus
+    ChangesetStatus, User
 from kallithea.model.notification import NotificationModel
 from kallithea.lib.utils2 import safe_unicode
+from kallithea.lib.utils2 import extract_mentioned_users, safe_unicode
 log = logging.getLogger(__name__)
 class PullRequestModel(BaseModel):
@@ @@ -103,16 +103,20 @@ class PullRequestModel(BaseModel): @@
             org_repo,
             ChangesetStatus.STATUS_UNDER_REVIEW,
             new.author,
             comment,
             pull_request=new
+        )
         self.__add_reviewers(new, reviewers)
         mention_recipients = set(User.get_by_username(username, case_insensitive=True)
                                  for username in extract_mentioned_users(pr.description))
         self.__add_reviewers(new, reviewers, mention_recipients)
         return new
     def __add_reviewers(self, pr, reviewers):
+    def __add_reviewers(self, pr, reviewers, mention_recipients=None):
         #members
         for member in set(reviewers):
             _usr = self._get_user(member)
             reviewer = PullRequestReviewers(_usr, pr)
             Session().add(reviewer)
@@ @@ -142,18 +146,41 @@ class PullRequestModel(BaseModel): @@
             'pr_revisions': revision_data,
             'repo_name': pr.other_repo.repo_name,
             'pr_id': pr.pull_request_id,
             'ref': org_ref_name,
             'pr_username': pr.author.username,
             'threading': [pr_url],
             'is_mention': False,
+            }
         if reviewers:
         NotificationModel().create(created_by=pr.author, subject=subject, body=body,
                                    recipients=reviewers,
                                    type_=Notification.TYPE_PULL_REQUEST,
                                    email_kwargs=email_kwargs)
         if mention_recipients:
             mention_recipients.discard(None)
             mention_recipients.difference_update(reviewers)
         if mention_recipients:
             email_kwargs['is_mention'] = True
             subject = _('[Mention]') + ' ' + subject
             NotificationModel().create(created_by=pr.author, subject=subject, body=body,
                                        recipients=mention_recipients,
                                        type_=Notification.TYPE_PULL_REQUEST,
                                        email_kwargs=email_kwargs)
     def mention_from_description(self, pr, old_description=''):
         mention_recipients = set(User.get_by_username(username, case_insensitive=True)
                                  for username in extract_mentioned_users(pr.description))
         mention_recipients.difference_update(User.get_by_username(username, case_insensitive=True)
                                              for username in extract_mentioned_users(old_description))
         log.debug("Mentioning %s" % mention_recipients)
         self.__add_reviewers(pr, [], mention_recipients)
     def update_reviewers(self, pull_request, reviewers_ids):
         reviewers_ids = set(reviewers_ids)
         pull_request = self.__get_pull_request(pull_request)
         current_reviewers = PullRequestReviewers.query()\
                             .filter(PullRequestReviewers.pull_request==
                                    pull_request)\

kallithea/templates/email_templates/changeset_comment.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 %if is_mention:
 <p>${_('Comment from %s on %s changeset %s mentioned you') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))}:</p>
 %else:
 <p>${_('Comment from %s on %s changeset %s') % (cs_comment_user, cs_target_repo, h.short_id(raw_id))}:</p>
 %endif
 <p>${body}</p>
 %if status_change:
     <p>${_('The changeset status was changed to')}: <b>${status_change}</b></p>
 %endif

kallithea/templates/email_templates/pull_request.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="main.html"/>
 %if is_mention:
 <p>${_('%s mentioned you on %s pull request "%s"') % (pr_user_created, repo_name, pr_title)}</p>
 %else:
 <p>${_('%s requested your review of %s pull request "%s"') % (pr_user_created, repo_name, pr_title)}</p>
 %endif
 <p>${_('URL')}: <a href="${pr_url}">${pr_url}</a></p>
 <p>${_('Description')}:</p>
 <p style="white-space: pre-wrap;">${body}</p>

0 comments (0 inline, 0 general)