Mercurial > kallithea
changeset 5924:0cb43732260b
pullrequests: make it easier to see what needs attention on "my" list; list PRs needing attention separately
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 23 May 2016 18:02:33 +0200 |
| parents | 96779dba8b01 |
| children | 0590e974ac35 |
| files | kallithea/controllers/pullrequests.py kallithea/templates/pullrequests/pullrequest_show_my.html |
| diffstat | 2 files changed, 15 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/pullrequests.py Tue May 17 23:10:33 2016 +0200 +++ b/kallithea/controllers/pullrequests.py Mon May 23 18:02:33 2016 +0200 @@ -219,11 +219,19 @@ self.authuser.user_id) \ .all()) - c.participate_in_pull_requests = _filter(PullRequest.query() \ - .join(PullRequestReviewers) \ + c.participate_in_pull_requests = [] + c.participate_in_pull_requests_todo = [] + done_status = set([ChangesetStatus.STATUS_APPROVED, ChangesetStatus.STATUS_REJECTED]) + for pr in _filter(PullRequest.query() + .join(PullRequestReviewers) .filter(PullRequestReviewers.user_id == - self.authuser.user_id) \ - ) + self.authuser.user_id) + ): + status = pr.user_review_status(c.authuser.user_id) # very inefficient!!! + if status in done_status: + c.participate_in_pull_requests.append(pr) + else: + c.participate_in_pull_requests_todo.append(pr) return render('/pullrequests/pullrequest_show_my.html')
--- a/kallithea/templates/pullrequests/pullrequest_show_my.html Tue May 17 23:10:33 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show_my.html Mon May 23 18:02:33 2016 +0200 @@ -35,6 +35,9 @@ <div class="pullrequests_section_head">${_('Pull Requests Created by Me')}</div> ${pullrequest_data.pullrequest_overview(c.my_pull_requests)} + <div class="pullrequests_section_head" style="clear:both">${_('Pull Requests Needing My Review')}</div> + ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests_todo)} + <div class="pullrequests_section_head" style="clear:both">${_('Pull Requests I Participate In')}</div> ${pullrequest_data.pullrequest_overview(c.participate_in_pull_requests)}