diff --git a/rhodecode/controllers/pullrequests.py b/rhodecode/controllers/pullrequests.py --- a/rhodecode/controllers/pullrequests.py +++ b/rhodecode/controllers/pullrequests.py @@ -192,6 +192,7 @@ class PullrequestsController(BaseRepoCon reviewers_ids = map(int, filter(lambda v: v not in [None, ''], request.POST.get('reviewers_ids', '').split(','))) + PullRequestModel().update_reviewers(pull_request_id, reviewers_ids) Session.commit() return True @@ -266,12 +267,15 @@ class PullrequestsController(BaseRepoCon cs_statuses[st.author.username] += [st] c.pull_request_reviewers = [] + c.pull_request_pending_reviewers = [] for o in c.pull_request.reviewers: st = cs_statuses.get(o.user.username, None) if st: sorter = lambda k: k.version st = [(x, list(y)[0]) for x, y in (groupby(sorted(st, key=sorter), sorter))] + else: + c.pull_request_pending_reviewers.append(o.user) c.pull_request_reviewers.append([o.user, st]) # pull_requests repo_name we opened it against diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -22,14 +22,33 @@ %if c.pull_request.is_closed():
${_('Closed %s') % (h.age(c.pull_request.updated_on))}
%endif -

${_('Title')}: ${c.pull_request.title} -
- %if c.current_changeset_status: -
[${h.changeset_status_lbl(c.current_changeset_status)}]
-
- %endif -
-

+

${_('Title')}: ${c.pull_request.title}

+ +
+
+
+
+ +
+
+
+ %if c.current_changeset_status: +
[${h.changeset_status_lbl(c.current_changeset_status)}]
+
+ %endif +
+
+
+
+
+ +
+
+
${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}
+
+
+
+
${h.literal(c.pull_request.description)}
${_('Created on')}: ${h.fmt_date(c.pull_request.created_on)}