diff --git a/kallithea/controllers/pullrequests.py b/kallithea/controllers/pullrequests.py --- a/kallithea/controllers/pullrequests.py +++ b/kallithea/controllers/pullrequests.py @@ -504,6 +504,19 @@ class PullrequestsController(BaseRepoCon _form = PullRequestPostForm()().to_python(request.POST) reviewer_ids = set(int(s) for s in _form['review_members']) + org_reviewer_ids = set(int(s) for s in _form['org_review_members']) + current_reviewer_ids = set(prr.user_id for prr in pull_request.reviewers) + other_added = [User.get(u) for u in current_reviewer_ids - org_reviewer_ids] + other_removed = [User.get(u) for u in org_reviewer_ids - current_reviewer_ids] + if other_added: + h.flash(_('Meanwhile, the following reviewers have been added: %s') % + (', '.join(u.username for u in other_added)), + category='warning') + if other_removed: + h.flash(_('Meanwhile, the following reviewers have been removed: %s') % + (', '.join(u.username for u in other_removed)), + category='warning') + if _form['updaterev']: return self.create_new_iteration(pull_request, _form['updaterev'], diff --git a/kallithea/model/forms.py b/kallithea/model/forms.py --- a/kallithea/model/forms.py +++ b/kallithea/model/forms.py @@ -538,6 +538,7 @@ def PullRequestPostForm(): pullrequest_title = v.UnicodeString(strip=True, required=True) pullrequest_desc = v.UnicodeString(strip=True, required=False) + org_review_members = v.Set() review_members = v.Set() updaterev = v.UnicodeString(strip=True, required=False, if_missing=None) owner = All(v.UnicodeString(strip=True, required=True), diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -225,6 +225,9 @@ ${self.repo_context_bar('showpullrequest
## members goes here !
+ %for member,status in c.pull_request_reviewers: + + %endfor