github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-26 17:54:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: respect prioritize_username_in_ux setting on /about page

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/discourse/components/about-page-users.js
View File

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

8
app/assets/javascripts/discourse/templates/components/about-page-users.hbs
View File

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