# HG changeset patch
# User Angel Ezquerra <[email protected]>
# Date 1456052683 -3600
# Sun Feb 21 12:04:43 2016 +0100
# Branch stable
# Node ID e28802b277d61139d193c5c1833504398bcf3973
# Parent 1b8fa58fddda34e218c31f61bc571a342f7e96fc
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.
diff --git a/kallithea/model/db.py b/kallithea/model/db.py
--- a/kallithea/model/db.py
+++ b/kallithea/model/db.py
@@ -1411,7 +1411,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):
diff --git a/kallithea/templates/changelog/changelog.html
b/kallithea/templates/changelog/changelog.html
--- a/kallithea/templates/changelog/changelog.html
+++ b/kallithea/templates/changelog/changelog.html
@@ -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
diff --git a/kallithea/templates/changelog/changelog_summary_data.html
b/kallithea/templates/changelog/changelog_summary_data.html
--- a/kallithea/templates/changelog/changelog_summary_data.html
+++ b/kallithea/templates/changelog/changelog_summary_data.html
@@ -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
# HG changeset patch
# User Angel Ezquerra <[email protected]>
# Date 1456052683 -3600
# Sun Feb 21 12:04:43 2016 +0100
# Branch stable
# Node ID e28802b277d61139d193c5c1833504398bcf3973
# Parent 1b8fa58fddda34e218c31f61bc571a342f7e96fc
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.
diff --git a/kallithea/model/db.py b/kallithea/model/db.py
--- a/kallithea/model/db.py
+++ b/kallithea/model/db.py
@@ -1411,7 +1411,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):
diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html
--- a/kallithea/templates/changelog/changelog.html
+++ b/kallithea/templates/changelog/changelog.html
@@ -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
diff --git a/kallithea/templates/changelog/changelog_summary_data.html b/kallithea/templates/changelog/changelog_summary_data.html
--- a/kallithea/templates/changelog/changelog_summary_data.html
+++ b/kallithea/templates/changelog/changelog_summary_data.html
@@ -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
_______________________________________________
kallithea-general mailing list
[email protected]
http://lists.sfconservancy.org/mailman/listinfo/kallithea-general
