From 67fee4cab3514441c76805d99efcfffab2ee893d Mon Sep 17 00:00:00 2001 From: Clark Andrianasolo Date: Fri, 13 Sep 2024 11:58:38 +0200 Subject: [PATCH] Fixes #25466: A user should not be able to delete themselves in user management 8.2 --- .../src/main/elm/sources/UserManagement/View.elm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/UserManagement/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/UserManagement/View.elm index 75fe1579330..f05a34dd6ac 100644 --- a/webapp/sources/rudder/rudder-web/src/main/elm/sources/UserManagement/View.elm +++ b/webapp/sources/rudder/rudder-web/src/main/elm/sources/UserManagement/View.elm @@ -447,7 +447,7 @@ displayRightPanel model user = formSubmitSection provider = [ div [ class "btn-container" ] - [ button [ class "btn btn-sm btn-danger btn-delete", onClick (OpenDeleteModal user.login) ] [ text "Delete" ] + [ displayDeleteButton model user , button [ class ("btn btn-sm btn-status-toggle " @@ -514,6 +514,12 @@ displayRightPanel model user = ) ] +displayDeleteButton : Model -> User -> Html Msg +displayDeleteButton model user = -- Do not display button for current user + if user.login == model.userId then + text "" + else + button [ class "btn btn-sm btn-danger btn-delete", onClick (OpenDeleteModal user.login) ] [ text "Delete" ] displayUsersConf : Model -> Html Msg displayUsersConf model =