File tree 6 files changed +13
-12
lines changed
assets/javascripts/discourse
6 files changed +13
-12
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ export default class AssignedToPost extends Component {
12
12
@service siteSettings;
13
13
14
14
get nameOrUsername () {
15
- if (! this .siteSettings .prioritize_username_in_ux ) {
15
+ if (this .siteSettings .prioritize_full_name_in_ux ) {
16
16
return this .args .assignedToUser .name || this .args .assignedToUser .username ;
17
17
} else {
18
18
return this .args .assignedToUser .username ;
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ export default {
75
75
content . push (
76
76
unassignFromTopicButton (
77
77
this . topic ,
78
- this . siteSettings . prioritize_username_in_ux
78
+ this . siteSettings . prioritize_full_name_in_ux
79
79
)
80
80
) ;
81
81
}
@@ -136,11 +136,11 @@ function reassignToSelfButton() {
136
136
} ;
137
137
}
138
138
139
- function unassignFromTopicButton ( topic , prioritize_username_in_ux ) {
139
+ function unassignFromTopicButton ( topic , prioritize_full_name_in_ux ) {
140
140
let username =
141
141
topic . assigned_to_user ?. username || topic . assigned_to_group ?. name ;
142
142
143
- if ( topic . assigned_to_user && ! prioritize_username_in_ux ) {
143
+ if ( topic . assigned_to_user && prioritize_full_name_in_ux ) {
144
144
username = topic . assigned_to_user ?. name || topic . assigned_to_user ?. username ;
145
145
}
146
146
Original file line number Diff line number Diff line change @@ -478,8 +478,9 @@ function initialize(api) {
478
478
}
479
479
480
480
const icon = iconHTML ( assignee . username ? "user-plus" : "group-plus" ) ;
481
+ const showNameInUx = siteSettings . prioritize_full_name_in_ux ;
481
482
const name =
482
- ! siteSettings . prioritize_username_in_ux || ! assignee . username
483
+ showNameInUx || ! assignee . username
483
484
? assignee . name || assignee . username
484
485
: assignee . username ;
485
486
@@ -556,7 +557,7 @@ function initialize(api) {
556
557
557
558
let displayedName = "" ;
558
559
if ( assignedToUser ) {
559
- displayedName = ! this . siteSettings . prioritize_username_in_ux
560
+ displayedName = this . siteSettings . prioritize_full_name_in_ux
560
561
? assignedToUser . name || assignedToUser . username
561
562
: assignedToUser . username ;
562
563
@@ -594,7 +595,7 @@ function initialize(api) {
594
595
const postNumber = indirectlyAssignedTo [ postId ] . post_number ;
595
596
596
597
displayedName =
597
- ! this . siteSettings . prioritize_username_in_ux || ! assignee . username
598
+ this . siteSettings . prioritize_full_name_in_ux || ! assignee . username
598
599
? assignee . name || assignee . username
599
600
: assignee . username ;
600
601
Original file line number Diff line number Diff line change @@ -492,7 +492,7 @@ def queue_notification(assignment)
492
492
end
493
493
494
494
def small_action_username_or_name ( assign_to )
495
- if ( assign_to . is_a? ( User ) && ! SiteSetting . prioritize_username_in_ux ) ||
495
+ if ( assign_to . is_a? ( User ) && SiteSetting . prioritize_full_name_in_ux ) ||
496
496
!assign_to . try ( :username )
497
497
custom_fields = { "action_code_who" => assign_to . name || assign_to . username }
498
498
else
Original file line number Diff line number Diff line change 12
12
before do
13
13
skip "Tests are broken and need to be fixed. See https://github.com/discourse/discourse/actions/runs/13890376408/job/38861216842"
14
14
SiteSetting . assign_enabled = true
15
- SiteSetting . prioritize_username_in_ux = true
15
+ SiteSetting . prioritize_full_name_in_ux = false
16
16
# The system tests in this file are flaky and auth token related so turning this on
17
17
SiteSetting . verbose_auth_token_logging = true
18
18
@@ -61,7 +61,7 @@ def assign_post(post, assignee)
61
61
end
62
62
63
63
context "when prioritize_full_name_in_ux setting is enabled" do
64
- before { SiteSetting . prioritize_username_in_ux = false }
64
+ before { SiteSetting . prioritize_full_name_in_ux = true }
65
65
66
66
it "shows the user's name after assign" do
67
67
visit "/t/#{ topic . id } "
Original file line number Diff line number Diff line change 10
10
11
11
before do
12
12
SiteSetting . assign_enabled = true
13
-
13
+ SiteSetting . prioritize_full_name_in_ux = false
14
14
# The system tests in this file are flaky and auth token related so turning this on
15
15
SiteSetting . verbose_auth_token_logging = true
16
16
50
50
end
51
51
52
52
context "when prioritize_full_name_in_ux setting is enabled" do
53
- before { SiteSetting . prioritize_username_in_ux = false }
53
+ before { SiteSetting . prioritize_full_name_in_ux = true }
54
54
55
55
it "shows the user's name after assign" do
56
56
visit "/t/#{ topic . id } "
You can’t perform that action at this time.
0 commit comments