Mercurial > kallithea
changeset 5721:b1bec568c0a2
summary, changelog: add reviewer username to status change tooltips
Change the status change (circle) icon tooltips from "Changeset status:
NEW_STATE" to "Changeset status: NEWSTATE by REVIEWER_USERNAME".
This makes it much faster to check who is reviewing what and who approved or
rejected what.
| author | Angel Ezquerra <angel.ezquerra@gmail.com> |
|---|---|
| date | Sun, 21 Feb 2016 12:04:43 +0100 |
| parents | 494989b0ce72 |
| children | 862fecc3af18 |
| files | kallithea/model/db.py kallithea/templates/changelog/changelog.html kallithea/templates/changelog/changelog_summary_data.html |
| diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/db.py Sun Feb 21 10:43:53 2016 +0100 +++ b/kallithea/model/db.py Sun Feb 21 12:04:43 2016 +0100 @@ -1418,7 +1418,8 @@ pr_nice_id = PullRequest.make_nice_id(pr_id) pr_repo = stat.pull_request.other_repo.repo_name grouped[stat.revision] = [str(stat.status), stat.status_lbl, - pr_id, pr_repo, pr_nice_id] + pr_id, pr_repo, pr_nice_id, + stat.author] return grouped def _repo_size(self):
--- a/kallithea/templates/changelog/changelog.html Sun Feb 21 10:43:53 2016 +0100 +++ b/kallithea/templates/changelog/changelog.html Sun Feb 21 12:04:43 2016 +0100 @@ -89,11 +89,12 @@ %if c.statuses.get(cs.raw_id): <div class="changeset-status-ico"> %if c.statuses.get(cs.raw_id)[2]: - <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> + <a class="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i> </a> %else: - <a class="tooltip" title="${_('Changeset status: %s') % c.statuses.get(cs.raw_id)[1]}" href="${c.comments[cs.raw_id][0].url()}"> + <a class="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}" + href="${c.comments[cs.raw_id][0].url()}"> <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i> </a> %endif
--- a/kallithea/templates/changelog/changelog_summary_data.html Sun Feb 21 10:43:53 2016 +0100 +++ b/kallithea/templates/changelog/changelog_summary_data.html Sun Feb 21 12:04:43 2016 +0100 @@ -17,11 +17,12 @@ %if c.statuses.get(cs.raw_id): <span class="changeset-status-ico shortlog"> %if c.statuses.get(cs.raw_id)[2]: - <a class="tooltip" title="${_('Changeset status: %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> + <a class="tooltip" title="${_('Changeset status: %s by %s\nClick to open associated pull request %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username, c.statuses.get(cs.raw_id)[4])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"> <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i> </a> %else: - <a class="tooltip" title="${_('Changeset status: %s') % c.statuses.get(cs.raw_id)[1]}" href="${c.comments[cs.raw_id][0].url()}"> + <a class="tooltip" title="${_('Changeset status: %s by %s') % (c.statuses.get(cs.raw_id)[1], c.statuses.get(cs.raw_id)[5].username)}" + href="${c.comments[cs.raw_id][0].url()}"> <i class="icon-circle changeset-status-${c.statuses.get(cs.raw_id)[0]}"></i> </a> %endif