FIX: respect `prioritize_username_in_ux` setting on /about page

This commit is contained in:
Arpit Jalan 2020-03-23 20:27:23 +05:30
parent f413ea6b38
commit e58f0adfcc
2 changed files with 18 additions and 8 deletions

View File

@ -4,22 +4,28 @@ import { formatUsername } from "discourse/lib/utilities";
import { normalize } from "discourse/components/user-info";
import { renderAvatar } from "discourse/helpers/user-avatar";
import { computed } from "@ember/object";
import { prioritizeNameInUx } from "discourse/lib/settings";
export default Component.extend({
usersTemplates: computed("users.[]", function() {
return (this.users || []).map(user => {
let name = "";
if (user.name && normalize(user.username) !== normalize(user.name)) {
name = user.name;
let name = user.name;
let username = user.username;
let prioritizeName = prioritizeNameInUx(name, this.siteSettings);
let hideName = false;
if (normalize(username) === normalize(name)) {
hideName = true;
}
return {
username: user.username,
name,
userPath: userPath(user.username),
username,
userPath: userPath(username),
avatar: renderAvatar(user, { imageSize: "large" }),
title: user.title || "",
formatedUsername: formatUsername(user.username)
formatedUsername: formatUsername(username),
prioritizeName,
hideName
};
});
})

View File

@ -11,10 +11,14 @@
<div class="name-line">
<span class="username">
<a href={{userTemplate.userPath}} data-user-card={{userTemplate.username}}>
{{userTemplate.username}}
{{#if userTemplate.prioritizeName}}{{userTemplate.name}}{{else}}{{userTemplate.username}}{{/if}}
</a>
</span>
<span class="name">{{userTemplate.name}}</span>
<span class="name">
{{#unless userTemplate.hideName}}
{{#if userTemplate.prioritizeName}}{{userTemplate.username}}{{else}}{{userTemplate.name}}{{/if}}
{{/unless}}
</span>
</div>
<div class="title">{{userTemplate.title}}</div>
</div>