Mercurial > kallithea
changeset 5248:18a600874f40
pullrequest: re-add username when adding reviewers
Commit 90e982b6bca8 removed the username when adding reviewers, to align the
way new and existing reviewers are displayed. However, when a user does not
have a name set, the list of reviewers becomes useless unless the username
is displayed too.
| author | Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> |
|---|---|
| date | Tue, 23 Jun 2015 21:29:15 +0200 |
| parents | b566aae19e21 |
| children | 81c70071b6f2 |
| files | kallithea/public/js/base.js kallithea/templates/pullrequests/pullrequest_show.html |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/js/base.js Tue Jun 23 20:28:11 2015 +0200 +++ b/kallithea/public/js/base.js Tue Jun 23 21:29:15 2015 +0200 @@ -1379,7 +1379,10 @@ } var addReviewMember = function(id,fname,lname,nname,gravatar_link,gravatar_size){ - var displayname = "{0} {1}".format(fname, lname); + var displayname = nname; + if ((fname != "") && (lname != "")) { + displayname = "{0} {1} ({2})".format(fname, lname, nname); + } var gravatarelm = gravatar(gravatar_link, gravatar_size, ""); // WARNING: the HTML below is duplicate with // kallithea/templates/pullrequests/pullrequest_show.html
--- a/kallithea/templates/pullrequests/pullrequest_show.html Tue Jun 23 20:28:11 2015 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Tue Jun 23 21:29:15 2015 +0200 @@ -223,7 +223,7 @@ <div class="reviewer_gravatar gravatar"> ${h.gravatar(member.email, size=14)} </div> - <div style="float:left;">${member.full_name} (${_('Owner') if c.pull_request.user_id == member.user_id else _('Reviewer')})</div> + <div style="float:left;">${member.full_name_and_username} (${_('Owner') if c.pull_request.user_id == member.user_id else _('Reviewer')})</div> <input type="hidden" value="${member.user_id}" name="review_members" /> %if editable: <div class="reviewer_member_remove action_button" onclick="removeReviewMember(${member.user_id})" title="${_('Remove reviewer')}">