Skip to content

Commit

Permalink
Merge pull request #157 from mawinter69/JENKINS-71272
Browse files Browse the repository at this point in the history
[JENKINS-71272] ensure proper confirmDelete jelly is used
  • Loading branch information
jglick authored Aug 14, 2023
2 parents 038d4b0 + 05acd80 commit 5ab5f56
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 0 deletions.
53 changes: 53 additions & 0 deletions src/main/resources/hudson/matrix/MatrixRun/confirmDelete.jelly
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 5ab5f56

Please sign in to comment.