engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pull-requests: added awaiting my review filter for users pull-requests.

Browse source 
- additionally the awaiting my review now properly filters pull requests that have no review votes on them
This commit is contained in:
RhodeCode Admin 2021-04-20 12:59:31 +02:00
parent 0031dcc28b
commit aded27dc31
11 changed files with 347 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rhodecode/apps/repository/views/repo_pull_requests.py
View file

@ -79,21 +79,20 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
if filter_type == 'awaiting_review':
pull_requests = PullRequestModel().get_awaiting_review(
repo_name, search_q=search_q, source=source, opened_by=opened_by,
statuses=statuses, offset=start, length=limit,
order_by=order_by, order_dir=order_dir)
repo_name,
search_q=search_q, statuses=statuses,
offset=start, length=limit, order_by=order_by, order_dir=order_dir)
pull_requests_total_count = PullRequestModel().count_awaiting_review(
repo_name, search_q=search_q, source=source, statuses=statuses,
opened_by=opened_by)
repo_name,
search_q=search_q, statuses=statuses)
elif filter_type == 'awaiting_my_review':
pull_requests = PullRequestModel().get_awaiting_my_review(
repo_name, search_q=search_q, source=source, opened_by=opened_by,
user_id=self._rhodecode_user.user_id, statuses=statuses,
offset=start, length=limit, order_by=order_by,
order_dir=order_dir)
repo_name, self._rhodecode_user.user_id,
search_q=search_q, statuses=statuses,
offset=start, length=limit, order_by=order_by, order_dir=order_dir)
pull_requests_total_count = PullRequestModel().count_awaiting_my_review(
repo_name, search_q=search_q, source=source, user_id=self._rhodecode_user.user_id,
statuses=statuses, opened_by=opened_by)
repo_name, self._rhodecode_user.user_id,
search_q=search_q, statuses=statuses)
else:
pull_requests = PullRequestModel().get_all(
repo_name, search_q=search_q, source=source, opened_by=opened_by,
@ -110,6 +109,12 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
self.db_repo.repo_id, pull_request=pr,
include_drafts=False, count_only=True)
review_statuses = pr.reviewers_statuses(user=self._rhodecode_db_user)
my_review_status = ChangesetStatus.STATUS_NOT_REVIEWED
if review_statuses and review_statuses[4]:
_review_obj, _user, _reasons, _mandatory, statuses = review_statuses
my_review_status = statuses[0][1].status
data.append({
'name': _render('pullrequest_name',
pr.pull_request_id, pr.pull_request_state,
@ -118,6 +123,8 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView):
'name_raw': pr.pull_request_id,
'status': _render('pullrequest_status',
pr.calculated_review_status()),
'my_status': _render('pullrequest_status',
my_review_status),
'title': _render('pullrequest_title', pr.title, pr.description),
'description': h.escape(pr.description),
'updated_on': _render('pullrequest_updated_on',