From 596ccc6775b7d2d3223ee012a7b48078cf34765d Mon Sep 17 00:00:00 2001 From: Harsh <116981900+reharsh@users.noreply.github.com> Date: Wed, 12 Mar 2025 00:40:30 +0530 Subject: [PATCH] settings: Hide deactivate button of owner for admins. Since only owners can deactivate other owners, we hide Deactivate button on owners profile when admins are using the ui. fixes: #33910. --- web/src/user_profile.ts | 3 +++ web/templates/settings/admin_human_form.hbs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/src/user_profile.ts b/web/src/user_profile.ts index 19206f20a6..ec1fcd93ef 100644 --- a/web/src/user_profile.ts +++ b/web/src/user_profile.ts @@ -1134,6 +1134,8 @@ export function show_edit_user_info_modal(user_id: number, $container: JQuery): return; } + const hide_deactivate_button = + current_user.is_admin && !current_user.is_owner && person.is_owner; const html_body = render_admin_human_form({ user_id, email: person.delivery_email, @@ -1141,6 +1143,7 @@ export function show_edit_user_info_modal(user_id: number, $container: JQuery): user_role_values: settings_config.user_role_values, disable_role_dropdown: person.is_owner && !current_user.is_owner, is_active, + hide_deactivate_button, }); $container.append($(html_body)); diff --git a/web/templates/settings/admin_human_form.hbs b/web/templates/settings/admin_human_form.hbs index 4a44c7f743..f10616ecb1 100644 --- a/web/templates/settings/admin_human_form.hbs +++ b/web/templates/settings/admin_human_form.hbs @@ -26,7 +26,7 @@
-