Mercurial > kallithea
changeset 5249:81c70071b6f2
autocomplete: consistently show 'username (Full Name)'
author | Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> |
---|---|
date | Tue, 30 Jun 2015 22:30:57 +0200 |
parents | 18a600874f40 |
children | 3d3bec370fa5 |
files | kallithea/public/js/base.js |
diffstat | 1 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/js/base.js Tue Jun 23 21:29:15 2015 +0200 +++ b/kallithea/public/js/base.js Tue Jun 30 22:30:57 2015 +0200 @@ -1183,8 +1183,7 @@ var grmembers = oResultData.grmembers; var grnameMatchIndex = grname.toLowerCase().indexOf(query); var grprefix = "{0}: ".format(_TM['Group']); - var grsuffix = " (" + grmembers + " )"; - var grsuffix = " ({0} {1})".format(grmembers, _TM['members']); + var grsuffix = " ({0} {1})".format(grmembers, _TM['members']); if (grnameMatchIndex > -1) { return autocompleteGravatar(grprefix + autocompleteHighlightMatch(grname, query, grnameMatchIndex) + grsuffix, null, null, true); @@ -1201,7 +1200,7 @@ var fnameMatchIndex = fname.toLowerCase().indexOf(query), lnameMatchIndex = lname.toLowerCase().indexOf(query), nnameMatchIndex = nname.toLowerCase().indexOf(query), - displayfname, displaylname, displaynname; + displayfname, displaylname, displaynname, displayname; if (fnameMatchIndex > -1) { displayfname = autocompleteHighlightMatch(fname, query, fnameMatchIndex); @@ -1216,12 +1215,17 @@ } if (nnameMatchIndex > -1) { - displaynname = "(" + autocompleteHighlightMatch(nname, query, nnameMatchIndex) + ")"; + displaynname = autocompleteHighlightMatch(nname, query, nnameMatchIndex); } else { - displaynname = nname ? "(" + nname + ")" : ""; + displaynname = nname; } - return autocompleteGravatar(displayfname + " " + displaylname + " " + displaynname, oResultData.gravatar_lnk, oResultData.gravatar_size); + displayname = displaynname; + if (displayfname && displaylname) { + displayname = "{0} {1} ({2})".format(displayfname, displaylname, displayname); + } + + return autocompleteGravatar(displayname, oResultData.gravatar_lnk, oResultData.gravatar_size); } else { return ''; }