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

DEV: Temporarily revert prioritize_username_in_ux for prioritize_full_name_in_ux (#656)

This commit is contained in:
Juan David Martínez Cubillos 2025-04-10 13:44:55 -05:00 committed by GitHub
parent d8888c4589
commit 261a47d119
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/discourse/components/assigned-to-post.gjs
View File

@ -12,7 +12,7 @@ export default class AssignedToPost extends Component {
@service siteSettings; @service siteSettings;
get nameOrUsername() { get nameOrUsername() {
if (!this.siteSettings.prioritize_username_in_ux) { if (this.siteSettings.prioritize_full_name_in_ux) {
return this.args.assignedToUser.name || this.args.assignedToUser.username; return this.args.assignedToUser.name || this.args.assignedToUser.username;
} else { } else {
return this.args.assignedToUser.username; return this.args.assignedToUser.username;

6
assets/javascripts/discourse/components/topic-level-assign-menu.js
View File

@ -75,7 +75,7 @@ export default {
content.push( content.push(
unassignFromTopicButton( unassignFromTopicButton(
this.topic, this.topic,
this.siteSettings.prioritize_username_in_ux this.siteSettings.prioritize_full_name_in_ux
) )
); );
} }
@ -136,11 +136,11 @@ function reassignToSelfButton() {
}; };
} }
function unassignFromTopicButton(topic, prioritize_username_in_ux) { function unassignFromTopicButton(topic, prioritize_full_name_in_ux) {
let username = let username =
topic.assigned_to_user?.username || topic.assigned_to_group?.name; topic.assigned_to_user?.username || topic.assigned_to_group?.name;
if (topic.assigned_to_user && !prioritize_username_in_ux) { if (topic.assigned_to_user && prioritize_full_name_in_ux) {
username = topic.assigned_to_user?.name || topic.assigned_to_user?.username; username = topic.assigned_to_user?.name || topic.assigned_to_user?.username;
} }

7
assets/javascripts/discourse/initializers/extend-for-assigns.js
View File

@ -478,8 +478,9 @@ function initialize(api) {
} }
const icon = iconHTML(assignee.username ? "user-plus" : "group-plus"); const icon = iconHTML(assignee.username ? "user-plus" : "group-plus");
const showNameInUx = siteSettings.prioritize_full_name_in_ux;
const name = const name =
!siteSettings.prioritize_username_in_ux || !assignee.username showNameInUx || !assignee.username
? assignee.name || assignee.username ? assignee.name || assignee.username
: assignee.username; : assignee.username;
@ -556,7 +557,7 @@ function initialize(api) {
let displayedName = ""; let displayedName = "";
if (assignedToUser) { if (assignedToUser) {
displayedName = !this.siteSettings.prioritize_username_in_ux displayedName = this.siteSettings.prioritize_full_name_in_ux
? assignedToUser.name || assignedToUser.username ? assignedToUser.name || assignedToUser.username
: assignedToUser.username; : assignedToUser.username;
@ -594,7 +595,7 @@ function initialize(api) {
const postNumber = indirectlyAssignedTo[postId].post_number; const postNumber = indirectlyAssignedTo[postId].post_number;
displayedName = displayedName =
!this.siteSettings.prioritize_username_in_ux || !assignee.username this.siteSettings.prioritize_full_name_in_ux || !assignee.username
? assignee.name || assignee.username ? assignee.name || assignee.username
: assignee.username; : assignee.username;

2
lib/assigner.rb
View File

@ -492,7 +492,7 @@ class ::Assigner
end end
def small_action_username_or_name(assign_to) def small_action_username_or_name(assign_to)
if (assign_to.is_a?(User) && !SiteSetting.prioritize_username_in_ux) || if (assign_to.is_a?(User) && SiteSetting.prioritize_full_name_in_ux) ||
!assign_to.try(:username) !assign_to.try(:username)
custom_fields = { "action_code_who" => assign_to.name || assign_to.username } custom_fields = { "action_code_who" => assign_to.name || assign_to.username }
else else

4
spec/system/assign_post_spec.rb
View File

@ -12,7 +12,7 @@ describe "Assign | Assigning posts", type: :system do
before do before do
skip "Tests are broken and need to be fixed. See https://github.com/discourse/discourse/actions/runs/13890376408/job/38861216842" skip "Tests are broken and need to be fixed. See https://github.com/discourse/discourse/actions/runs/13890376408/job/38861216842"
SiteSetting.assign_enabled = true SiteSetting.assign_enabled = true
SiteSetting.prioritize_username_in_ux = true SiteSetting.prioritize_full_name_in_ux = false
# The system tests in this file are flaky and auth token related so turning this on # The system tests in this file are flaky and auth token related so turning this on
SiteSetting.verbose_auth_token_logging = true SiteSetting.verbose_auth_token_logging = true
@ -61,7 +61,7 @@ describe "Assign | Assigning posts", type: :system do
end end
context "when prioritize_full_name_in_ux setting is enabled" do context "when prioritize_full_name_in_ux setting is enabled" do
before { SiteSetting.prioritize_username_in_ux = false } before { SiteSetting.prioritize_full_name_in_ux = true }
it "shows the user's name after assign" do it "shows the user's name after assign" do
visit "/t/#{topic.id}" visit "/t/#{topic.id}"

4
spec/system/assign_topic_spec.rb
View File

@ -10,7 +10,7 @@ describe "Assign | Assigning topics", type: :system do
before do before do
SiteSetting.assign_enabled = true SiteSetting.assign_enabled = true
SiteSetting.prioritize_full_name_in_ux = false
# The system tests in this file are flaky and auth token related so turning this on # The system tests in this file are flaky and auth token related so turning this on
SiteSetting.verbose_auth_token_logging = true SiteSetting.verbose_auth_token_logging = true
@ -50,7 +50,7 @@ describe "Assign | Assigning topics", type: :system do
end end
context "when prioritize_full_name_in_ux setting is enabled" do context "when prioritize_full_name_in_ux setting is enabled" do
before { SiteSetting.prioritize_username_in_ux = false } before { SiteSetting.prioritize_full_name_in_ux = true }
it "shows the user's name after assign" do it "shows the user's name after assign" do
visit "/t/#{topic.id}" visit "/t/#{topic.id}"