diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserProfileSheet.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserProfileSheet.xml index 15150d649a75..45db617001f1 100644 --- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserProfileSheet.xml +++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserProfileSheet.xml @@ -37,9 +37,10 @@ xwiki/2.0 true {{velocity}} -#if ("$!request.userId" != "" && ($request.action == "disable" || $request.action == "enable") && $services.csrf.isTokenValid($request.csrf)) +#if ($hasAdmin && "$!request.userId" != "" && ($request.action == "disable" || $request.action == "enable") && $services.csrf.isTokenValid($request.csrf)) #set ($user = $xwiki.getUser($request.userId)) -#if ($user.getUser().exists($xcontext.context)) +#set ($isCurrentUser = $user.getUser().userReference.equals($xcontext.userReference)) +#if (!$isCurrentUser && $user.getUser().exists($xcontext.context)) #set ($disabled = ($request.action == "disable")) #set ($discard = $user.setDisabledStatus($disabled)) #set ($success = ($disabled && $user.isDisabled()) || (!$disabled && !$user.isDisabled()))