Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "FIX: correctly respects full name settings in channel title (#22566)" (#22569) 

This reverts commit aa9c7dc924.
This commit is contained in:
Joffrey JAFFEUX 2023-07-12 18:46:19 +02:00 committed by GitHub
parent aa9c7dc924
commit 10f6395545
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/chat/assets/javascripts/discourse/components/chat-channel-title.hbs
View File

@ -19,9 +19,7 @@
<span class="chat-channel-title__name">{{this.usernames}}</span> <span class="chat-channel-title__name">{{this.usernames}}</span>
{{else}} {{else}}
{{#let @channel.chatable.users.firstObject as |user|}} {{#let @channel.chatable.users.firstObject as |user|}}
<span class="chat-channel-title__name"> <span class="chat-channel-title__name">{{user.username}}</span>
<ChatUserDisplayName @user={{user}} />
</span>
{{#if this.showUserStatus}} {{#if this.showUserStatus}}
<UserStatusMessage <UserStatusMessage
@class="chat-channel-title__user-status-message" @class="chat-channel-title__user-status-message"
@ -37,6 +35,8 @@
/> />
{{/let}} {{/let}}
{{/if}} {{/if}}
{{else}}
<span class="chat-channel-title__name">Add users</span>
{{/if}} {{/if}}
</div> </div>
</div> </div>

18
plugins/chat/test/javascripts/components/chat-channel-title-test.js
View File

@ -80,24 +80,6 @@ module("Discourse Chat | Component | chat-channel-title", function (hooks) {
); );
}); });
test("direct message channel - one user showing full name", async function (assert) {
this.siteSettings.prioritize_username_in_ux = true;
this.user = fabricators.user({
username: "joffrey",
name: "Joffrey Baratheon",
});
this.channel = fabricators.directMessageChannel({
chatable: fabricators.directMessage({ users: [this.user] }),
});
await render(hbs`<ChatChannelTitle @channel={{this.channel}} />`);
assert
.dom(".chat-user-display-name__username.-first")
.hasText(this.user.username);
assert.dom(".chat-user-display-name__name").hasText(this.user.name);
});
test("direct message channel - multiple users", async function (assert) { test("direct message channel - multiple users", async function (assert) {
const channel = fabricators.directMessageChannel(); const channel = fabricators.directMessageChannel();