paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

profile-settings: Change name-input class to a more specific id.

Browse Source 
Changes `name-input` class, that was only being used in a div
wrapper for the input element for changing a user's full name,
to be a more specific id name: `full_name_input_container`.

This id is used to set or remove the disabled setting tooltip
when name changes are disabled by the organization.

There are no CSS rules set with this class/id.
This commit is contained in:
Lauryn Menard
2023-01-25 19:13:27 +01:00
committed by Tim Abbott
parent 264a34d543
commit d8b8b34ecd
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend_tests/node_tests/settings_org.js
View File

@@ -752,25 +752,25 @@ test("misc", ({override_rewire}) => {
page_params.server_name_changes_disabled = false; page_params.server_name_changes_disabled = false;
settings_account.update_name_change_display(); settings_account.update_name_change_display();
assert.ok(!$("#full_name").prop("disabled")); assert.ok(!$("#full_name").prop("disabled"));
assert.ok(!$(".name-input").hasClass("name_changes_disabled_tooltip")); assert.ok(!$("#full_name_input_container").hasClass("name_changes_disabled_tooltip"));
page_params.realm_name_changes_disabled = true; page_params.realm_name_changes_disabled = true;
page_params.server_name_changes_disabled = false; page_params.server_name_changes_disabled = false;
settings_account.update_name_change_display(); settings_account.update_name_change_display();
assert.ok($("#full_name").prop("disabled")); assert.ok($("#full_name").prop("disabled"));
assert.ok($(".name-input").hasClass("name_changes_disabled_tooltip")); assert.ok($("#full_name_input_container").hasClass("name_changes_disabled_tooltip"));
page_params.realm_name_changes_disabled = true; page_params.realm_name_changes_disabled = true;
page_params.server_name_changes_disabled = true; page_params.server_name_changes_disabled = true;
settings_account.update_name_change_display(); settings_account.update_name_change_display();
assert.ok($("#full_name").prop("disabled")); assert.ok($("#full_name").prop("disabled"));
assert.ok($(".name-input").hasClass("name_changes_disabled_tooltip")); assert.ok($("#full_name_input_container").hasClass("name_changes_disabled_tooltip"));
page_params.realm_name_changes_disabled = false; page_params.realm_name_changes_disabled = false;
page_params.server_name_changes_disabled = true; page_params.server_name_changes_disabled = true;
settings_account.update_name_change_display(); settings_account.update_name_change_display();
assert.ok($("#full_name").prop("disabled")); assert.ok($("#full_name").prop("disabled"));
assert.ok($(".name-input").hasClass("name_changes_disabled_tooltip")); assert.ok($("#full_name_input_container").hasClass("name_changes_disabled_tooltip"));
page_params.realm_email_changes_disabled = false; page_params.realm_email_changes_disabled = false;
settings_account.update_email_change_display(); settings_account.update_email_change_display();
@@ -801,7 +801,7 @@ test("misc", ({override_rewire}) => {
page_params.is_admin = true; page_params.is_admin = true;
settings_account.update_name_change_display(); settings_account.update_name_change_display();
assert.ok(!$("#full_name").prop("disabled")); assert.ok(!$("#full_name").prop("disabled"));
assert.ok(!$(".name-input").hasClass("name_changes_disabled_tooltip")); assert.ok(!$("#full_name_input_container").hasClass("name_changes_disabled_tooltip"));
settings_account.update_email_change_display(); settings_account.update_email_change_display();
assert.ok(!$("#change_email_button").prop("disabled")); assert.ok(!$("#change_email_button").prop("disabled"));

4
static/js/settings_account.js
View File

@@ -57,10 +57,10 @@ export function update_name_change_display() {
if (!settings_data.user_can_change_name()) { if (!settings_data.user_can_change_name()) {
$("#full_name").prop("disabled", true); $("#full_name").prop("disabled", true);
$(".name-input").addClass("name_changes_disabled_tooltip"); $("#full_name_input_container").addClass("name_changes_disabled_tooltip");
} else { } else {
$("#full_name").prop("disabled", false); $("#full_name").prop("disabled", false);
$(".name-input").removeClass("name_changes_disabled_tooltip"); $("#full_name_input_container").removeClass("name_changes_disabled_tooltip");
} }
} }

2
static/js/tippyjs.js
View File

@@ -399,7 +399,7 @@ export function initialize() {
}); });
delegate("body", { delegate("body", {
target: [".name-input.name_changes_disabled_tooltip"], target: ["#full_name_input_container.name_changes_disabled_tooltip"],
content: $t({ content: $t({
defaultMessage: defaultMessage:
"Name changes are disabled in this organization. Contact an administrator to change your name.", "Name changes are disabled in this organization. Contact an administrator to change your name.",

2
static/templates/settings/profile_settings.hbs
View File

@@ -8,7 +8,7 @@
<div class="user-name-section inline-block"> <div class="user-name-section inline-block">
<label for="full_name" class="title inline-block">{{t "Full name" }}</label> <label for="full_name" class="title inline-block">{{t "Full name" }}</label>
<div class="alert-notification full-name-status"></div> <div class="alert-notification full-name-status"></div>
<div class="name-input {{#unless user_can_change_name}}name_changes_disabled_tooltip{{/unless}}"> <div id="full_name_input_container" {{#unless user_can_change_name}}class="name_changes_disabled_tooltip"{{/unless}}>
<input id="full_name" name="full_name" type="text" value="{{ page_params.full_name }}" {{#unless user_can_change_name}}disabled="disabled"{{/unless}} maxlength="60" /> <input id="full_name" name="full_name" type="text" value="{{ page_params.full_name }}" {{#unless user_can_change_name}}disabled="disabled"{{/unless}} maxlength="60" />
</div> </div>
</div> </div>