From 05acd800e3d65f11f4ca67cb36ae9501ab5724c8 Mon Sep 17 00:00:00 2001
From: Markus Winter <m.winter@sap.com>
Date: Mon, 15 May 2023 19:17:54 +0200
Subject: [PATCH] [JENKINS-71272] ensure proper confirmDelete jelly is used

solves the issue for the price of duplication of the confirmDelete file
---
 .../MatrixBuild}/confirmDelete.jelly          |  0
 .../matrix/MatrixRun/confirmDelete.jelly      | 53 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 rename src/main/resources/hudson/{model/Run => matrix/MatrixBuild}/confirmDelete.jelly (100%)
 create mode 100644 src/main/resources/hudson/matrix/MatrixRun/confirmDelete.jelly

diff --git a/src/main/resources/hudson/model/Run/confirmDelete.jelly b/src/main/resources/hudson/matrix/MatrixBuild/confirmDelete.jelly
similarity index 100%
rename from src/main/resources/hudson/model/Run/confirmDelete.jelly
rename to src/main/resources/hudson/matrix/MatrixBuild/confirmDelete.jelly
diff --git a/src/main/resources/hudson/matrix/MatrixRun/confirmDelete.jelly b/src/main/resources/hudson/matrix/MatrixRun/confirmDelete.jelly
new file mode 100644
index 00000000..d659b629
--- /dev/null
+++ b/src/main/resources/hudson/matrix/MatrixRun/confirmDelete.jelly
@@ -0,0 +1,53 @@
+<!--
+The MIT License
+
+Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+ Modification of https://github.com/jenkinsci/jenkins/blob/master/core/src/main/resources/hudson/model/Run/confirmDelete.jelly
+
+ We copy this template in order to use it.deleteMessage instead of it.whyKeepLog as displayed message.
+ This is required in order to have a warning which does not prevent the actual deletion.
+-->
+
+<!-- Confirm deletion of the build/run -->
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
+         xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
+  <l:layout title="${it.fullDisplayName}" norefresh="true">
+    <st:include page="sidepanel.jelly"/>
+    <l:main-panel>
+      <j:set var="msg" value="${it.deleteMessage}"/>
+      <j:if test="${msg!=null}">
+        <p class="warning">${%Warning}: ${msg}</p>
+      </j:if>
+
+      <j:if test="${it.whyKeepLog==null}">
+        <form method="post" action="doDelete">
+          ${%Are you sure about deleting the build?}
+          <f:submit value="${%Yes}"/>
+        </form>
+      </j:if>
+
+    </l:main-panel>
+  </l:layout>
+</j:jelly>