[JENKINS-71429] Fix deleting users via trashcan symbol (#8131)

[JENKINS-71429] fix user delete On manage -> Users, clicking the delete icon lead to the old delete.jelly page that was deleted when replacing the page with a confirmation popup. Replace it with a confirmation link.
jenkinsci · Jun 12, 2023 · c886642 · c886642
1 parent 561c19d
commit c886642
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
@@ -71,9 +71,10 @@ THE SOFTWARE.
               <td>
                 <j:if test="${user.canDelete()}">
                   <div class="jenkins-table__cell__button-wrapper">
-                    <a href="${user.url}/delete" class="jenkins-table__button jenkins-!-destructive-color">
+                    <l:confirmationLink href="${user.url}/doDelete" class="jenkins-table__button jenkins-!-destructive-color"
+                                        post="true" message="${%delete.user(user.displayName)}">
                       <l:icon src="symbol-trash" />
-                    </a>
+                    </l:confirmationLink>
                   </div>
                 </j:if>
               </td>

diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.properties b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.properties
@@ -24,3 +24,4 @@ blurb=\
 These users can log into Jenkins. This is a sub set of <a href="../asynchPeople">this list</a>, \
 which also contains auto-created users who really just made some commits on some projects and have no \
 direct Jenkins access.
+delete.user=Delete Jenkins user ‘{0}’?