kallithea Changeset - 18a600874f40

Changeset - 18a600874f40

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Thomas De Schampheleire - 10 years ago 2015-06-23 21:29:15
thomas.de.schampheleire@gmail.com

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.

2 files changed with 5 insertions and 2 deletions:

kallithea/public/js/base.js

kallithea/templates/pullrequests/pullrequest_show.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1376,13 +1376,16 @@ var MentionsAutoComplete = function (inp @@
             mentionsAC.dataSource.chunks = unam[1];
             mentionsAC.dataSource.mentionQuery = curr_search;
         });
+}
 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
     // If you change something here it should be reflected in the template too.
     var element = (
         '     <li id="reviewer_{2}">\n'+

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -220,13 +220,13 @@ ${self.repo_context_bar('showpullrequest @@
                     <div class="reviewer_status tooltip" title="${h.tooltip(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>
                   <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')}">
                       <i class="icon-minus-circled"></i>
                   </div>
                   %endif

0 comments (0 inline, 0 general)