paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-28 10:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

manage_user_modal: Update deactivate user button design.

Browse Source 
This commit updates the "Deactivate User" button in the manage user
modal to use the new action button component.

Fixes part of #33027.
This commit is contained in:
Sayam Samal
2025-03-03 15:22:10 +05:30
committed by Tim Abbott
parent 85d57780b8
commit 0ddac6adbd
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
web/src/tippyjs.ts
View File

@@ -375,10 +375,7 @@ export function initialize(): void {
}); });
tippy.delegate("body", { tippy.delegate("body", {
target: [ target: "#deactivate_account_container.disabled_setting_tooltip",
"#deactivate_account_container.disabled_setting_tooltip",
"#edit-user-form .deactivate_user_button_tooltip",
].join(","),
content: $t({ content: $t({
defaultMessage: defaultMessage:
"Because you are the only organization owner, you cannot deactivate your account.", "Because you are the only organization owner, you cannot deactivate your account.",

1
web/src/user_profile.ts
View File

@@ -1140,7 +1140,6 @@ export function show_edit_user_info_modal(user_id: number, $container: JQuery):
full_name: person.full_name, full_name: person.full_name,
user_role_values: settings_config.user_role_values, user_role_values: settings_config.user_role_values,
disable_role_dropdown: person.is_owner && !current_user.is_owner, disable_role_dropdown: person.is_owner && !current_user.is_owner,
owner_is_only_user_in_organization: people.get_active_human_count() === 1,
is_active, is_active,
}); });

6
web/templates/settings/admin_human_form.hbs
View File

@@ -28,11 +28,7 @@
</form> </form>
<div class="input-group"> <div class="input-group">
{{#if is_active}} {{#if is_active}}
<span {{#if owner_is_only_user_in_organization}}class="deactivate_user_button_tooltip"{{/if}}> {{> ../components/action_button custom_classes="deactivate_user_button" type="quiet" intent="danger" label=(t "Deactivate user") aria-label=(t "Deactivate user") }}
<button class="button rounded button-danger deactivate_user_button" {{#if owner_is_only_user_in_organization}}disabled="disabled"{{/if}}>
{{t 'Deactivate user' }}
</button>
</span>
{{else}} {{else}}
<span> <span>
<button class="button rounded reactivate_user_button"> <button class="button rounded reactivate_user_button">