Mercurial > kallithea
changeset 5925:0590e974ac35
pullrequests: refactor how reviewer status is passed around internally
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 23 May 2016 18:02:33 +0200 |
| parents | 0cb43732260b |
| children | 133686b535d1 |
| files | kallithea/model/changeset_status.py kallithea/templates/pullrequests/pullrequest_show.html |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/changeset_status.py Mon May 23 18:02:33 2016 +0200 +++ b/kallithea/model/changeset_status.py Mon May 23 18:02:33 2016 +0200 @@ -101,11 +101,11 @@ for user in pull_request.get_reviewer_users(): st = cs_statuses.get(user.username) relevant_statuses.append(st) - if not st or st.status in (ChangesetStatus.STATUS_NOT_REVIEWED, - ChangesetStatus.STATUS_UNDER_REVIEW): - st = None + status = ChangesetStatus.STATUS_NOT_REVIEWED if st is None else st.status + if status in (ChangesetStatus.STATUS_NOT_REVIEWED, + ChangesetStatus.STATUS_UNDER_REVIEW): pull_request_pending_reviewers.append(user) - pull_request_reviewers.append((user, st)) + pull_request_reviewers.append((user, status)) result = self._calculate_status(relevant_statuses)
--- a/kallithea/templates/pullrequests/pullrequest_show.html Mon May 23 18:02:33 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Mon May 23 18:02:33 2016 +0200 @@ -230,8 +230,8 @@ ## If you change something here it should be reflected in the template too. <li id="reviewer_${member.user_id}"> <div class="reviewers_member"> - <div class="reviewer_status tooltip" title="${h.changeset_status_lbl(status.status if status else 'not_reviewed')}"> - <i class="icon-circle changeset-status-${status.status if status else 'not_reviewed'}"></i> + <div class="reviewer_status tooltip" title="${h.changeset_status_lbl(status)}"> + <i class="icon-circle changeset-status-${status}"></i> </div> ${h.gravatar_div(member.email, size=14, div_class="reviewer_gravatar gravatar")} <div style="float:left;">